Skip to content

Commit

Permalink
Merge 14c626b into ccd7121
Browse files Browse the repository at this point in the history
  • Loading branch information
jbiggsets committed Dec 10, 2018
2 parents ccd7121 + 14c626b commit 4c18e57
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions conda_requirements.txt
@@ -1,10 +1,10 @@
python>=3.6.3,<3.7
ipython=6.3.1
ipython=6.5.0
jupyter=1.0.0
joblib=0.11
matplotlib=2.1.2
nose=1.3.7
notebook=5.4.1
notebook=5.7.2
numpy=1.13.3
pandas=0.22.0
scikit-learn=0.19.1
Expand All @@ -22,4 +22,4 @@ sphinx
sphinx_rtd_theme
coverage
parameterized
setuptools
setuptools
6 changes: 3 additions & 3 deletions requirements.txt
@@ -1,9 +1,9 @@
ipython==6.3.1
ipython==6.5.0
jupyter==1.0.0
joblib==0.11
matplotlib==2.1.2
nose==1.3.7
notebook==5.4.1
notebook==5.7.2
numpy==1.13.3
pandas==0.22.0
scikit-learn==0.19.1
Expand All @@ -18,4 +18,4 @@ sphinx
sphinx_rtd_theme
coverage
parameterized
setuptools
setuptools

0 comments on commit 4c18e57

Please sign in to comment.