Skip to content

Commit

Permalink
Update version requirements; remove --process-dependency-links
Browse files Browse the repository at this point in the history
  • Loading branch information
calebbraun committed May 30, 2019
1 parent 7d87ae2 commit 675ec7b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ matrix:
dist: xenial
cache: pip
install:
- pip install --process-dependency-links .[xanthos,tethys]
- pip install .
script:
- python -m unittest
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
configobj>=5.0.6
gcam_reader>=0.5.0
pandas>=0.20

gcam_reader @ git+https://github.com/JGCRI/gcam_reader.git
tethys @ git+https://github.com/JGCRI/tethys.git
xanthos @ git+https://github.com/JGCRI/xanthos.git
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def readme():

def get_requirements():
with open('requirements.txt') as f:
return f.read().split()
return f.read().split('\n')


setup(
Expand All @@ -28,13 +28,13 @@ def get_requirements():
long_description=readme(),
install_requires=get_requirements(),
extras_require={
'xanthos': ["xanthos>=2.1.0"],
'tethys': ["tethys>=1.0.0"],
'xanthos': ["xanthos>=2.3.1"],
'tethys': ["tethys>=1.2.0"],
},
dependency_links=[
'git+https://github.com/JGCRI/gcam_reader@master#egg=gcam_reader-0.5.0',
'git+https://github.com/JGCRI/tethys@master#egg=tethys-1.0.0',
'git+https://github.com/JGCRI/xanthos@master#egg=xanthos-2.1.0',
'git+https://github.com/JGCRI/gcam_reader@master#egg=gcam_reader-1.0.0',
'git+https://github.com/JGCRI/tethys@master#egg=tethys-1.2.0',
'git+https://github.com/JGCRI/xanthos@master#egg=xanthos-2.3.1',
],
classifiers=[
"Programming Language :: Python :: 3.6"
Expand Down

0 comments on commit 675ec7b

Please sign in to comment.