diff --git a/.travis.yml b/.travis.yml index 99bfb6c..616e479 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,14 @@ env: stage: Test (OSX) language: generic cache: - pip: cache + pip: true directories: - $HOME/Library/Caches/Homebrew - $HOME/.pyenv_cache install: ci/travis/osx/install.sh script: ci/travis/osx/script.sh before_cache: ci/travis/osx/before_cache.sh + before_deploy: ci/travis/osx/before_deploy.sh after_success: ci/travis/osx/after_success.sh jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index c18a61c..87340ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] -[Unreleased]: https://github.com/althonos/pyrodigal/compare/v0.1.0...HEAD +[Unreleased]: https://github.com/althonos/pyrodigal/compare/v0.1.1...HEAD + + +## [v0.1.1] - 2020-04-30 +[v0.1.1]: https://github.com/althonos/pyrodigal/compare/v0.1.0...v0.1.1 +### Added +- Distribution of CPython wheels for ManyLinux2010 and OSX platforms. ## [v0.1.0] - 2020-04-27 diff --git a/README.md b/README.md index 72f51e0..5ac5665 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ the user but offers more flexibility. **Roadmap**: - [x] Metagenomic mode -- [ ] Thread safety - [ ] Single mode - [ ] External training file support (`-t` flag) - [ ] Region masking (`-m` flag) diff --git a/ci/requirements.txt b/ci/requirements.txt index 04367b2..295d396 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -2,7 +2,8 @@ coverage ~=5.0 codecov ~=2.0 cython ~=0.29.16 -auditwheel +auditwheel twine +setuptools -r ../tests/requirements.txt diff --git a/ci/travis/deploy.sh b/ci/travis/deploy.sh index 6e8922a..5b48c52 100755 --- a/ci/travis/deploy.sh +++ b/ci/travis/deploy.sh @@ -15,5 +15,14 @@ chandler push --github="$TRAVIS_REPO_SLUG" --changelog="CHANGELOG.md" # --- Deploy to PyPI --------------------------------------------------------- -log Deploying to PyPI -python3 -m twine upload --skip-existing dist/*.whl dist/*.tar.gz +if [ "$TRAVIS_OS_NAME" = "osx" ]; then + log Activating pyenv + eval "$(pyenv init -)" + pyenv shell $(pyenv versions --bare) + + log Deploying to PyPI + $PYTHON -m twine upload --skip-existing dist/*.whl +else + log Deploying to PyPI + python3 -m twine upload --skip-existing dist/*.whl dist/*.tar.gz +fi diff --git a/ci/travis/manylinux/before_deploy.sh b/ci/travis/manylinux/before_deploy.sh index 7298ff6..26307f7 100755 --- a/ci/travis/manylinux/before_deploy.sh +++ b/ci/travis/manylinux/before_deploy.sh @@ -5,7 +5,7 @@ # --- Build wheel ------------------------------------------------------------ case $TRAVIS_PYTHON_VERSION in - pypy3) TAG=pypy3.6-7.3;; + pypy3) TAG=pp36-pypy3_*;; *) TAG=cp$(echo $TRAVIS_PYTHON_VERSION | sed 's/\.//');; esac diff --git a/ci/travis/manylinux/install.sh b/ci/travis/manylinux/install.sh index 3f16292..0791c99 100755 --- a/ci/travis/manylinux/install.sh +++ b/ci/travis/manylinux/install.sh @@ -5,7 +5,7 @@ # --- Install Python dependencies -------------------------------------------- case $TRAVIS_PYTHON_VERSION in - pypy3) TAG=pypy3.6-7.3;; + pypy3) TAG=pp36-pypy3_*;; *) TAG=cp$(echo $TRAVIS_PYTHON_VERSION | sed 's/\.//');; esac diff --git a/ci/travis/manylinux/script.sh b/ci/travis/manylinux/script.sh index 22bd6eb..cc6a528 100755 --- a/ci/travis/manylinux/script.sh +++ b/ci/travis/manylinux/script.sh @@ -5,7 +5,7 @@ # --- Test ------------------------------------------------------------------- case $TRAVIS_PYTHON_VERSION in - pypy3) TAG=pypy3.6-7.3;; + pypy3) TAG=pp36-pypy3_*;; *) TAG=cp$(echo $TRAVIS_PYTHON_VERSION | sed 's/\.//');; esac diff --git a/ci/travis/osx/install.sh b/ci/travis/osx/install.sh index 5805b2f..bfbf872 100755 --- a/ci/travis/osx/install.sh +++ b/ci/travis/osx/install.sh @@ -30,4 +30,4 @@ log Using $(python --version | head -n1 | cut -d' ' -f1,2) # --- Install Python requirements -------------------------------------------- log Installing Python requirements -$PYTHON -m pip install -r "$TRAVIS_BUILD_DIR/ci/requirements.txt" +$PYTHON -m pip install -U -r "$TRAVIS_BUILD_DIR/ci/requirements.txt" diff --git a/pyrodigal/_version.txt b/pyrodigal/_version.txt index 6e8bf73..17e51c3 100644 --- a/pyrodigal/_version.txt +++ b/pyrodigal/_version.txt @@ -1 +1 @@ -0.1.0 +0.1.1