Skip to content

Commit

Permalink
BUG fix package versions to avoid installing MKL (#9)
Browse files Browse the repository at this point in the history
* BUG make sure conda env is consistent wrt use of MKL
* ENH pin conda to 4.1.11
* DOC updated release date
  • Loading branch information
beckermr authored Feb 13, 2017
1 parent 99472ee commit 31d3645
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ Version number changes (major.minor.micro) in this package denote the following:
- A minor version will increase if one or more packages contained in the Docker image add new, backwards-compatible features, or if a new package is added to the Docker image.
- A major version will increase if there are any backwards-incompatible changes in any of the packages contained in this Docker image, or any other backwards-incompabile changes in the execution environment.

## [1.1.0] - 2017-02-10
## [1.1.0] - 2017-02-13
### Changed
- Add environment variables which record the image version number (#1)
- Upgraded civis library from v1.1.0 to v1.2.0
- Upgraded civis library from v1.1.0 to v1.2.0 (#5)
- Various changes to packages to avoid installing MKL (#9)
- Pinned conda to 4.1.11 (#9)

### Fixed
- Changed location of `matplotlibrc` to always be found (#6)
Expand All @@ -20,4 +22,3 @@ Version number changes (major.minor.micro) in this package denote the following:
## [1.0.0] - 2017-01-17

* Initial Release

3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \
wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.1.11-Linux-x86_64.sh && \
/bin/bash /Miniconda3-4.1.11-Linux-x86_64.sh -b -p /opt/conda && \
rm Miniconda3-4.1.11-Linux-x86_64.sh && \
/opt/conda/bin/conda install --yes conda==4.1.11
/opt/conda/bin/conda install --yes conda==4.1.11 && \
echo "conda ==4.1.11" > /opt/conda/conda-meta/pinned

# environment for bash
RUN echo "source activate datascience" >> /etc/profile && \
Expand Down
6 changes: 3 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: datascience
dependencies:
- beautifulsoup4=4.5.1
- boto=2.43.0
- cython=0.25.1
- ipython=5.1.0
- jsonschema=2.5.1
Expand All @@ -17,8 +18,8 @@ dependencies:
- nose=1.3.7
- nltk=3.2.1
- numexpr=2.6.1
- numpy=1.11.2
- openblas=0.2.14
- numpy=1.11.3
- openblas=0.2.19
- pandas=0.19.1
- patsy=0.4.1
- psycopg2=2.6.2
Expand All @@ -33,7 +34,6 @@ dependencies:
- statsmodels=0.6.1
- pip:
- awscli==1.11.27
- boto==2.43.0
- boto3==1.4.2
- civis==1.2.0
- dropbox==7.1.1
Expand Down

0 comments on commit 31d3645

Please sign in to comment.