diff --git a/.github/workflows/autorelease-default-env.sh b/.github/workflows/autorelease-default-env.sh index f1da159..70cf6fb 100644 --- a/.github/workflows/autorelease-default-env.sh +++ b/.github/workflows/autorelease-default-env.sh @@ -1,4 +1,6 @@ -INSTALL_AUTORELEASE="python -m pip install autorelease==0.2.6" +# Vendored from Autorelease 0.5.1 +# Update by updating Autorelease and running `autorelease vendor actions` +INSTALL_AUTORELEASE="python -m pip install autorelease==0.5.1" if [ -f autorelease-env.sh ]; then source autorelease-env.sh fi diff --git a/.github/workflows/autorelease-deploy.yml b/.github/workflows/autorelease-deploy.yml index 9a8f03b..491d871 100644 --- a/.github/workflows/autorelease-deploy.yml +++ b/.github/workflows/autorelease-deploy.yml @@ -1,10 +1,13 @@ -name: Autorelease +# Vendored from Autorelease 0.5.1 +# Update by updating Autorelease and running `autorelease vendor actions` +name: "Autorelease Deploy" on: release: types: [published] jobs: deploy_pypi: + if: ${{ github.repository == 'openpathsampling/openpathsampling-cli' }} runs-on: ubuntu-latest name: "Deploy to PyPI" steps: @@ -17,7 +20,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | python -m pip install twine wheel diff --git a/.github/workflows/autorelease-gh-rel.yml b/.github/workflows/autorelease-gh-rel.yml index bb5cd27..99f3728 100644 --- a/.github/workflows/autorelease-gh-rel.yml +++ b/.github/workflows/autorelease-gh-rel.yml @@ -1,11 +1,15 @@ -name: Autorelease +# Vendored from Autorelease 0.5.1 +# Update by updating Autorelease and running `autorelease vendor actions` +name: "Autorelease Release" on: push: branches: + # TODO: this should come from yaml conf - stable jobs: release-gh: + if: ${{ github.repository == 'openpathsampling/openpathsampling-cli' }} runs-on: ubuntu-latest name: "Cut release" steps: @@ -18,7 +22,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | VERSION=`python setup.py --version` @@ -27,3 +35,4 @@ jobs: autorelease-release --project $PROJECT --version $VERSION --token $AUTORELEASE_TOKEN env: AUTORELEASE_TOKEN: ${{ secrets.AUTORELEASE_TOKEN }} + name: "Cut release" diff --git a/.github/workflows/autorelease-prep.yml b/.github/workflows/autorelease-prep.yml index 4967413..c98e09a 100644 --- a/.github/workflows/autorelease-prep.yml +++ b/.github/workflows/autorelease-prep.yml @@ -1,7 +1,10 @@ -name: "Autorelease" +# Vendored from Autorelease 0.5.1 +# Update by updating Autorelease and running `autorelease vendor actions` +name: "Autorelease testpypi" on: pull_request: branches: + # TODO: this should come from yaml conf - stable defaults: @@ -10,6 +13,7 @@ defaults: jobs: deploy_testpypi: + if: ${{ github.repository == 'openpathsampling/openpathsampling-cli' }} runs-on: ubuntu-latest name: "Deployment test" steps: @@ -22,10 +26,14 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | - python -m pip install twine wheel + python -m pip install twine wheel setuptools name: "Install release tools" - run: | bump-dev-version @@ -41,6 +49,7 @@ jobs: repository_url: https://test.pypi.org/legacy/ name: "Deploy to testpypi" test_testpypi: + if: ${{ github.repository == 'openpathsampling/openpathsampling-cli' }} runs-on: ubuntu-latest name: "Test deployed" needs: deploy_testpypi @@ -54,7 +63,17 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - - run: test-testpypi - + - name: "Install testpypi version" + run: install-testpypi + - name: "Test testpypi version" + run: | + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi + test-testpypi diff --git a/autorelease-env.sh b/autorelease-env.sh index 9074cb3..63249f8 100644 --- a/autorelease-env.sh +++ b/autorelease-env.sh @@ -1,2 +1,2 @@ -INSTALL_AUTORELEASE="python -m pip install autorelease==0.2.3 nose sqlalchemy dill" +INSTALL_AUTORELEASE="python -m pip install autorelease==0.5 nose sqlalchemy dill" PACKAGE_IMPORT_NAME=paths_cli diff --git a/setup.cfg b/setup.cfg index 0b67e88..738fa71 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = openpathsampling-cli -version = 0.2.2.dev0 +version = 0.3.1.dev0 # version should end in .dev0 if this isn't to be released description = Command line tool for OpenPathSampling long_description = file: README.md @@ -18,16 +18,13 @@ classifiers = Programming Language :: Python :: 3 [options] -python_requires = >= 3.7 +python_requires = >= 3.10 install_requires = click tqdm - openpathsampling >= 1.2 + openpathsampling >= 1.6 packages = find: [options.entry_points] console_scripts = openpathsampling = paths_cli.cli:main - -[bdist_wheel] -universal=1