From eacf4bf2935e60381c7fd2ffd51d9b18d018da0f Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Tue, 15 Jan 2019 13:06:37 +0100 Subject: [PATCH 1/5] update version to 0.3.2.dev0 The fix (about to be made) will be based off of the stable (0.3.1) branch. Then I'll cherry pick the commits that fix the problem into master. --- ci/conda-recipe/meta.yaml | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index 4d7323e..05fce21 100644 --- a/ci/conda-recipe/meta.yaml +++ b/ci/conda-recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: contact_map # add ".dev0" for unreleased versions - version: "0.3.1" + version: "0.3.2.dev0" source: path: ../../ diff --git a/setup.py b/setup.py index cafee03..1647008 100644 --- a/setup.py +++ b/setup.py @@ -9,8 +9,8 @@ ####################### USER SETUP AREA ################################# # * VERSION: base version (do not include .dev0, etc -- that's automatic) # * IS_RELEASE: whether this is a release -VERSION = "0.3.1" -IS_RELEASE = True +VERSION = "0.3.2" +IS_RELEASE = False DEV_NUM = 0 # always 0: we don't do public (pypi) .dev releases PRE_TYPE = "" # a, b, or rc (although we rarely release such versions) From b1b446c5df8f51b1f48d5b1352d46b19d33dfc10 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Tue, 15 Jan 2019 13:54:18 +0100 Subject: [PATCH 2/5] Finish update for 0.3.2 release --- .travis.yml | 2 +- ci/conda-recipe/meta.yaml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03cc830..89c1962 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: install: - source ci/pip-install/install_requirements.sh - pip install -e . - - pip install -r ci/pip-install/testing_requirements.txt + - pip install -U -r ci/pip-install/testing_requirements.txt - if [ "$MDTRAJ" = "dev" ]; then pip install --upgrade --force-reinstall -r ci/pip-install/mdtraj_dev.txt; fi - if [ "$MDTRAJ" = "dev" ]; then pip install -r optional_installs.txt; fi - pip list diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index 05fce21..b13ee02 100644 --- a/ci/conda-recipe/meta.yaml +++ b/ci/conda-recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: contact_map # add ".dev0" for unreleased versions - version: "0.3.2.dev0" + version: "0.3.2" source: path: ../../ diff --git a/setup.py b/setup.py index 1647008..fa0c629 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ # * VERSION: base version (do not include .dev0, etc -- that's automatic) # * IS_RELEASE: whether this is a release VERSION = "0.3.2" -IS_RELEASE = False +IS_RELEASE = True DEV_NUM = 0 # always 0: we don't do public (pypi) .dev releases PRE_TYPE = "" # a, b, or rc (although we rarely release such versions) From 06bd64a0834de507a93c32eee1734436a62377d0 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Tue, 15 Jan 2019 14:46:04 +0100 Subject: [PATCH 3/5] fix testing_requirements install in test testpypi --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89c1962..fe3e464 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ jobs: python: '3.6' install: - source ci/pip-install/install_requirements.sh - - pip install -r ci/pip-install/testing_requirements.txt + - pip install -U -r ci/pip-install/testing_requirements.txt - pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple contact_map script: - cd ~ From deaa98225ad84d5138a24c1fb09e07f89674f2c0 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Tue, 15 Jan 2019 15:08:09 +0100 Subject: [PATCH 4/5] bump to 0.3.3 (so pypi will test) --- ci/conda-recipe/meta.yaml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/conda-recipe/meta.yaml b/ci/conda-recipe/meta.yaml index b13ee02..d41dd42 100644 --- a/ci/conda-recipe/meta.yaml +++ b/ci/conda-recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: contact_map # add ".dev0" for unreleased versions - version: "0.3.2" + version: "0.3.3" source: path: ../../ diff --git a/setup.py b/setup.py index fa0c629..e76d3ec 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ ####################### USER SETUP AREA ################################# # * VERSION: base version (do not include .dev0, etc -- that's automatic) # * IS_RELEASE: whether this is a release -VERSION = "0.3.2" +VERSION = "0.3.3" IS_RELEASE = True DEV_NUM = 0 # always 0: we don't do public (pypi) .dev releases From 61be0f0f547286b4a9c5f76559c1f120a18165a4 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Tue, 15 Jan 2019 17:38:39 +0100 Subject: [PATCH 5/5] allow patch-level version skip (temporary) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe3e464..59b67c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ install: script: - export MPLBACKEND=PS - python -c "import contact_map" - - python autorelease_check.py --branch ${TRAVIS_BRANCH} --event ${TRAVIS_EVENT_TYPE} + - python autorelease_check.py --branch ${TRAVIS_BRANCH} --event ${TRAVIS_EVENT_TYPE} --allow-patch-skip #TODO remove allow-patch-skip - py.test -vv --cov=contact_map --cov-report xml:cov.xml after_success: