Skip to content

Commit

Permalink
Merge pull request #46 from dwhswenson/release-0.3.2
Browse files Browse the repository at this point in the history
Release 0.3.3
  • Loading branch information
dwhswenson authored Jan 16, 2019
2 parents 5b278f2 + 61be0f0 commit 7fb5b2f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ 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

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:
Expand Down Expand Up @@ -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 ~
Expand Down
2 changes: 1 addition & 1 deletion ci/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: contact_map
# add ".dev0" for unreleased versions
version: "0.3.1"
version: "0.3.3"

source:
path: ../../
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"
VERSION = "0.3.3"
IS_RELEASE = True

DEV_NUM = 0 # always 0: we don't do public (pypi) .dev releases
Expand Down

0 comments on commit 7fb5b2f

Please sign in to comment.