Skip to content

Commit

Permalink
Merge pull request #231 from Radiomics/reorganize-requirements
Browse files Browse the repository at this point in the history
requirements: Move nose and sphinx to dev requirements. See #230
  • Loading branch information
JoostJM authored Apr 24, 2017
2 parents b820c48 + be2214c commit 90efc86
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ jobs:
command: |
source activate python2
python -m pip install --no-cache-dir -r requirements.txt
python -m pip install --no-cache-dir -r requirements-dev.txt
python setup.py install
source activate root
python -m pip install --no-cache-dir -r requirements.txt
python -m pip install --no-cache-dir -r requirements-dev.txt
python setup.py install
- run:
name: Run tests in Python 2
Expand All @@ -48,7 +50,7 @@ jobs:
name: test notebooks in python 2 and 3
command: |
jupyter nbconvert --ExecutePreprocessor.kernel_name=python2 --ExecutePreprocessor.timeout=-1 --to notebook --execute /tmp/RadiomicsExample.ipynb /tmp/FeatureVisualization.ipynb /tmp/FeatureVisualizationWithClustering.ipynb /tmp/FilteringEffects.ipynb
jupyter nbconvert --ExecutePreprocessor.kernel_name=python3 --ExecutePreprocessor.timeout=-1 --to notebook --execute /tmp/RadiomicsExample.ipynb /tmp/FeatureVisualization.ipynb /tmp/FeatureVisualizationWithClustering.ipynb /tmp/FilteringEffects.ipynb
Expand Down
3 changes: 1 addition & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ recursive-include data *
exclude data/PyradiomicsFeatures.csv data/Baseline2PyradiomicsFeaturesDiff.csv

recursive-include tests *
recursive-include docs *.rst conf.py Makefile make.bat

recursive-exclude * __pycache__
recursive-exclude * *.py[co]
recursive-exclude * *.py[cod]
4 changes: 4 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
nose>=1.3.7
nose-parameterized>=0.5.0
flake8
flake8-import-order
sphinx>=1.4
sphinx_rtd_theme>=0.2.2
4 changes: 0 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
numpy>=1.9.2
SimpleITK>=0.9.1
nose>=1.3.7
nose-parameterized>=0.5.0
PyWavelets>=0.4.0
pykwalify>=1.6.0
six>=1.10.0
sphinx>=1.4
sphinx_rtd_theme>=0.2.2

0 comments on commit 90efc86

Please sign in to comment.