Skip to content

Commit

Permalink
MRG: add more information about deps (#35)
Browse files Browse the repository at this point in the history
* add more information about deps

* update Makefile and README

* add an environment yml

* update README

* add pandas

* bump version to 0.6.3

* update author list
  • Loading branch information
ctb authored Aug 29, 2023
1 parent 6cdf7d3 commit 0294fe8
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pyo3-branchwater"
version = "0.6.2"
version = "0.6.3"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ clean:

test:
$(PYTHON) -m pytest

wheel:
$(PYTHON) -m maturin build -r

sdist:
rm -f target/wheels/pyo3_branchwater-*.tar.gz
$(PYTHON) -m maturin sdist

upload_sdist: sdist
twine upload target/wheels/pyo3_branchwater-*.tar.gz
46 changes: 33 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,34 +90,54 @@ of sourmash plugins and Rust to provide some fast functionality
that may be of use to some people, and it can serve as a testbed for
future sourmash functionality.

## Develoer notes
## Developer notes

### Installing a development environment

You'll need sourmash, rust, and [maturin](https://github.com/PyO3/maturin).

A simple way to get up and running is to run:
```
mamba env create -n branchwatever-dev -f environment.yml
```
in the top directory of the repo, and then activate the environment and
install in editable mode:
```
mamba activate branchwater-dev
pip install -e .
```

### Running the tests locally

Executing:
```
make test
```
will run the Python tests.

### Generating a release

Bump version number in `Cargo.toml` and push.
1. Bump version number in `Cargo.toml` and run `make` to update `Cargo.lock`.
Then commit and push to `origin/main`.

Make a new release on github.
2. Make a new release on github with a matching version tag.

Then pull, and:
3. Then pull, and:

```
rm -fr target/wheels/
maturin sdist
make sdist
make upload_sdist
```

followed by `twine upload target/wheels/pyo3_branchwater-*.tar.gz`
to create a new release on PyPI.

### Building wheels

You can build a wheel for your current platform with:
You can build a release wheel for your current platform with:
```
maturin build
make wheel
```
and it will be placed under `target/wheels/`.

---

Expand All @@ -127,7 +147,7 @@ This software is under the AGPL license. Please see [LICENSE.txt](LICENSE.txt).

## Authors

Luiz Irber
C. Titus Brown
Mohamed Abuelanin
N. Tessa Pierce-Ward
* Luiz Irber
* C. Titus Brown
* Mohamed Abuelanin
* N. Tessa Pierce-Ward
12 changes: 12 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: branchwater-dev
channels:
- conda-forge
- bioconda
- defaults
dependencies:
- sourmash>=4.8.3,<5
- pip
- rust
- maturin>=1,<2
- pytest
- pandas
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ classifiers = [
"Programming Language :: Rust",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
]
]
dependencies = ["sourmash>=4.8.3,<5"]

[build-system]
requires = ["maturin>=1.1.0,<2"]
Expand Down

0 comments on commit 0294fe8

Please sign in to comment.