Skip to content

Commit

Permalink
Merge pull request #161 from aiidateam/fix_160_setup_requirements_aii…
Browse files Browse the repository at this point in the history
…da_core_optional

Fix the requirements string for aiida-core and atomic_tools optional
  • Loading branch information
giovannipizzi authored Jun 13, 2018
2 parents c119e00 + 658acb1 commit 4a4e949
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ before_install:
install:
# Upgrade pip setuptools and wheel to be able to run the next command
- pip install -U pip wheel setuptools reentry
# Install AiiDA with some optional dependencies
- pip install .[atomic_tools,docs,dev_precommit]

# Install the repository with some optional dependencies
- pip install .[docs,dev_precommit]

env:
- TEST_TYPE="pre-commit"
- TEST_AIIDA_BACKEND=django TEST_TYPE="docs"
- TEST_AIIDA_BACKEND=django TEST_TYPE="tests"
- TEST_AIIDA_BACKEND=sqlalchemy TEST_TYPE="tests"


before_script:
- .travis-data/setup_profiles.sh
- .travis-data/before_script.sh
Expand Down
2 changes: 1 addition & 1 deletion setup.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
]
},
"install_requires": [
"aiida_core>=0.12.0,<1.0.0[atomic_tools]",
"aiida_core[atomic_tools]>=0.12.0,<1.0.0",
"click"
],
"license": "MIT License",
Expand Down

0 comments on commit 4a4e949

Please sign in to comment.