diff --git a/autorelease-travis.yml b/autorelease-travis.yml index 6719230..f429882 100644 --- a/autorelease-travis.yml +++ b/autorelease-travis.yml @@ -1,8 +1,8 @@ -# AUTORELEASE v0.1.2 +# AUTORELEASE v0.2.0 # for nonrelease, use @master # for release, use v${VERSION}, e.g., v1.0.0 import: - - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.1.2 - - dwhswenson/autorelease:travis_stages/cut_release.yml@v0.1.2 - - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.1.2 - - dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.1.2 + - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.2.0 + - dwhswenson/autorelease:travis_stages/cut_release.yml@v0.2.0 + - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.2.0 + - dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.2.0 diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index ca181fe..36185c0 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: autorelease # add ".dev0" for unreleased versions - version: "0.1.2" + version: "0.2.0" source: path: ../../ diff --git a/setup.cfg b/setup.cfg index c68f1c4..f316443 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = autorelease -version = 0.1.2 +version = 0.2.0 # version should end in .dev0 if this isn't to be released short_description = Tools to keep the release process clean. description = Tools to keep the release process clean. diff --git a/travis_stages/deploy_pypi.yml b/travis_stages/deploy_pypi.yml index d77a6bf..1848758 100644 --- a/travis_stages/deploy_pypi.yml +++ b/travis_stages/deploy_pypi.yml @@ -15,7 +15,7 @@ jobs: provider: pypi distributions: sdist bdist_wheel #skip_cleanup: true # need the readme.rst from the script stage - user: $TWINE_USERNAME + username: $TWINE_USERNAME on: tags: true password: $TWINE_PASSWORD diff --git a/travis_stages/test_testpypi.yml b/travis_stages/test_testpypi.yml index fbd6cfd..2f89ead 100644 --- a/travis_stages/test_testpypi.yml +++ b/travis_stages/test_testpypi.yml @@ -18,14 +18,20 @@ jobs: - export VERSION=`pypi-max-version $PROJECT` - echo "Installing ${PROJECT}==${VERSION} (allowing pre-releases)" - pip install --pre --force-reinstall --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple ${PROJECT}==${VERSION} - before_script: skip + before_script: | + if [ -z "$PACKAGE_IMPORT_NAME" ]; then + export PACKAGE_IMPORT_NAME=$PROJECT + fi + echo "PROJECT: $PROJECT" + echo "PACKAGE_IMPORT_NAME: $PACKAGE_IMPORT_NAME" + echo "AUTORELEASE_TEST_TESTPYPI: $AUTORELEASE_TEST_TESTPYPI" script: | if [ -n "$AUTORELEASE_TEST_TESTPYPI" ]; then eval $AUTORELEASE_TEST_TESTPYPI else cd ~ - python -c "import $PROJECT" - py.test --pyargs $PROJECT + python -c "import $PACKAGE_IMPORT_NAME" + py.test --pyargs $PACKAGE_IMPORT_NAME fi after_failure: skip after_success: skip