Skip to content

Commit

Permalink
Merge 'master' into ml-evs/readme
Browse files Browse the repository at this point in the history
  • Loading branch information
CasperWA committed Dec 3, 2019
2 parents 3a86e3d + 6675838 commit 0eb271d
Show file tree
Hide file tree
Showing 63 changed files with 6,763 additions and 2,743 deletions.
36 changes: 30 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ language: python
cache: pip
python:
- "3.7"
- "3.8"
install:
- pip install -e .
- pip install -r requirements.txt
- pip install -r requirements/dev_requirements.txt
- pip install -r requirements/mongo_requirements.txt
- pip install -r requirements/django_requirements.txt
- pip install -r requirements/elastic_requirements.txt
- pip install -e .[testing,django,elastic]
- docker pull quen2404/openapi-diff
script:
- py.test --cov=optimade
Expand All @@ -22,3 +18,31 @@ script:
# check whether generated schema matches the committed version
- .ci/openapi_diff.sh
- codecov --token=$CODECOV_TOKEN

# Automatically deploy tags to PyPI
jobs:
include:
- stage: deploy
# Make sure the tag is valid semver
if: "tag =~ ^v[0-9]+\\.[0-9]+\\.[0-9]+(a|b|rc)?[0-9]*$"
python: 3.7
before_install: skip
install: skip
before_script: skip
script: skip
env: ignore
before_deploy:
- echo "About to deploy $TRAVIS_TAG to PyPI"
after_deploy:
- echo "Deployed $TRAVIS_TAG to PyPI"
# See https://docs.travis-ci.com/user/deployment/pypi/
deploy: &pypi
provider: pypi
skip_existing: true
user: "__token__"
password:
secure: jydagLMQt10k0l/XlVqYznqnfRpXDsnrPIDzxREBMwnoCWBvx7a+X/pEg2wFWMD3uY3/Qhev8dr6+RBgX0t1N0si4TpBMFKGkilMebRbHkkbdgRA19NSQTdgj3jml+3K095i1LO8xR7bSfn/XHZ+oN02EDdhCGEDnCLMoG9AGKLX0w/8lNu4clQxHMQ2hSTeT9imJrD6kZDDTJwMS6twF6QLwE7YowfaPRlqIn6EYjQJjDYLE6Px95v9WBeCdNuL6Yr+ojO8uiQvmj1WdpnxVG1LBYtpx3R5cb2bbj/Q8WAYniXmJGeB0lnOMqtmbDire3kZcn40JfJMJ47bNY79APkQqTylxByv1NomeCf3h4UQ0Ylr3kaKufif+PCixl7yG1YUrnOeE2Rzvtr9YyN9uJ8solpVooOtKnwWQwCkS/pcyi8h2CyfdSBLDlWai7ShkQHRCf2YDqxctyPbqaSar6ezUwT1lKtaFNdPaNfl6Au/PVJMr0ANp3Bfl74EXzoajzc9SlJBbAg/CRTbGq+Mfa8hZUtMwkSJCGcrcqz18x6rlTek/p/fmic8fdVjLSiD4V75q2r6ZrHT7OvmHUxDJ4JA4GwuWFMLNC4813ydXaC+rk3h4MxRnskSVs1v5YcBnb/7DudVWQa6ZAAOesbjqRtj8RfMLWrxW8BvBUUwKyI=
on:
repo: Materials-Consortia/optimade-python-tools
branch: master
tags: true
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pre-commit install
conda install -c anaconda mongodb
mkdir -p ~/dbdata && mongod --dbpath ~/dbdata --syslog --fork
# Start a development server (auto-reload on file changes at http://localhost:5000
# Start a development server (auto-reload on file changes at http://localhost:5000/optimade
# You can also execute ./run.sh
uvicorn optimade.server.main:app --reload --port 5000
Expand Down

0 comments on commit 0eb271d

Please sign in to comment.