Skip to content

Commit

Permalink
Merge fb5e869 into ee309fd
Browse files Browse the repository at this point in the history
  • Loading branch information
willronchetti committed May 18, 2020
2 parents ee309fd + fb5e869 commit b60a30a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
version: 2

python:
version: 3.6
install:
- method: pip
path: .
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ install:
script:
- flake8 dcicutils
- travis_wait coverage run --source=dcicutils -m pytest -vv test
- coveralls
- if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; then coveralls; fi;
deploy:
provider: script
script: poetry publish --build --username=$PYPI_USER --password=$PYPI_PASSWORD
script: if [ "$TRAVIS_PYTHON_VERSION" == "3.6" ]; then poetry publish --build --username=$PYPI_USER --password=$PYPI_PASSWORD; fi
on:
tags: true
after_success:
- echo "Finished running tests"
- |
if [[ $TRAVIS_BRANCH == 'master' ]]; then
if [[ $TRAVIS_BRANCH == 'master' && "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
echo 'Triggering docs build'
curl -X POST -d "branches=master" -d "token=$DOCS_TOKEN" https://readthedocs.org/api/v2/webhook/dcic-utils/99616/
fi
5 changes: 3 additions & 2 deletions dcicutils/deployment_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def main():
EB_ENV_VARIABLE_NAMESPACE = 'aws:elasticbeanstalk:application:environment'
STATUS = 'Status'
UPDATING = 'Updating'
LAUNCHING = 'Launching'
TERMINATING = 'Terminating'


Expand Down Expand Up @@ -295,14 +296,14 @@ def create_indexer_environment(cls, env_name, app_version):
EnvironmentName=CGAP_ENV_INDEXER,
TemplateName=CGAP_ENV_INDEXER,
VersionLabel=app_version
)[STATUS] == UPDATING and cls.delete_indexer_template(eb_client, CGAP_ENV_INDEXER)
)[STATUS] == LAUNCHING and cls.delete_indexer_template(eb_client, CGAP_ENV_INDEXER)
elif is_fourfront_env(env_name):
return eb_client.create_environment(
ApplicationName=cls.EB_APPLICATION,
EnvironmentName=FF_ENV_INDEXER,
TemplateName=FF_ENV_INDEXER,
VersionLabel=app_version
)[STATUS] == UPDATING and cls.delete_indexer_template(eb_client, FF_ENV_INDEXER)
)[STATUS] == LAUNCHING and cls.delete_indexer_template(eb_client, FF_ENV_INDEXER)
else: # should never get here, but for good measure
raise RuntimeError('Tried to deploy indexer from an unknown environment: %s' % env_name)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "dcicutils"
version = "0.27.0"
version = "0.27.1"
description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
license = "MIT"
Expand Down

0 comments on commit b60a30a

Please sign in to comment.