Remove RTD files and consolidate all requirements into one file #298
Conversation
| @@ -31,8 +31,7 @@ installed as follows:: | |||
| $ git clone https://github.com/DigitalSlideArchive/HistomicsTK.git | |||
| $ cd HistomicsTK | |||
| # pip install git+https://github.com/cdeepakroy/ctk-cli | |||
| $ pip install --no-cache-dir -r requirements_c_conda.txt | |||
| $ pip install --no-cache-dir -r requirements.txt -r requirements_c.txt | |||
| $ pip install --no-cache-dir -r requirements.txt | |||
There was a problem hiding this comment.
Any reason not to put the ctk-cli package in the requirements file as well?
There was a problem hiding this comment.
That is part of my plan!
I tried adding it, but parse_requirements was throwing an error. So i am first making sure TravisCI succeeds without adding it to the requirements.txt file to isolate the issue. Then i will add it back and check.
There was a problem hiding this comment.
This piece of code in setup.py where we use pkg_resources.parse_requirements to read in all dependencies from the requirements.txt file fails if we have editable requirements like -e git+https://github.com/cdeepakroy/ctk-cli#egg=ctk_cli.
Look at this discussion on a pypa/pip github issue and this discussion on stackoverflow that complicates doing this.
There was a problem hiding this comment.
I will refrain from adding it to requirements.txt in this PR as i don't have a solution for this issue at the moment.
There was a problem hiding this comment.
ctk_cli is anyway not needed when HistomicsTK is used as a pure python toolkit for analysis.
Codecov Report
@@ Coverage Diff @@
## master #298 +/- ##
=======================================
Coverage 44.26% 44.26%
=======================================
Files 2 2
Lines 61 61
=======================================
Hits 27 27
Misses 34 34Continue to review full report at Codecov.
|
|
Can you also modify the |
|
I believe you have all the ansible references sorted, once this goes in @danlamanna will need to merge/rebase his refactor branch, that will propagate down to the vagrant fixes and we should be all set. |
requirements.txt
Outdated
| # scientific packages | ||
| # | ||
| Cython>=0.24 | ||
| nimfa==1.2.3 |
There was a problem hiding this comment.
Can we change the nimfa requirement to >=?
| # | ||
| ############################################################### | ||
| lxml>=3.4.4 | ||
| docker-py==1.9.0 |
There was a problem hiding this comment.
We need docker-py for the deploy-docker script. Perhaps it should be moved to requirements-dev.txt.
There was a problem hiding this comment.
Should i also change everything in requirements_dev.txt to >=
There was a problem hiding this comment.
docker-py needs to be >=1.9,<2
There was a problem hiding this comment.
Otherwise, we probably just need to check to make sure they work with the current latest.
This PR includes the following changes