Skip to content

Commit

Permalink
Merge pull request #317 from NatLibFi/issue291-pin-down-more-specific…
Browse files Browse the repository at this point in the history
…-versions-of-dependencies

Pin VW, Gensim, and Scikit-learn versions
  • Loading branch information
osma authored Aug 23, 2019
2 parents d67c082 + c6e89cd commit 93695bd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ install:
# For Python 3.5, also install optional dependencies that were not specified in Pipfile
# For other Python versions we will only run the tests that depend on pure Python modules
# - fastText dependencies
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install fasttextmirror; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install fasttextmirror==0.8.22; fi
# - voikko dependencies
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install voikko; fi
# - vw dependencies
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then sudo ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.a /usr/lib/x86_64-linux-gnu/libboost_python3.a; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then sudo ln -sf /usr/lib/x86_64-linux-gnu/libboost_python-py35.so /usr/lib/x86_64-linux-gnu/libboost_python3.so; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install vowpalwabbit; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install vowpalwabbit==8.7.*; fi
script:
- pytest --cov=./
after_success:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update \
build-essential \
&& pip install --no-cache-dir \
cython \
fasttextmirror \
fasttextmirror==0.8.22 \
## Vowpal Wabbit
&& apt-get install -y --no-install-recommends \
libboost-program-options-dev \
Expand Down Expand Up @@ -52,7 +52,7 @@ RUN apt-get update \
libboost-python1.67.0 \
libboost-system1.67.0 \
&& pip install --no-cache-dir \
vowpalwabbit \
vowpalwabbit==8.7.* \
## Clean up:
&& rm -rf /var/lib/apt/lists/* /usr/include/* \
&& rm -rf /root/.cache/pip*/*
Expand Down
6 changes: 3 additions & 3 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ connexion = {extras = ["swagger-ui"]}
swagger-ui-bundle = "*"
flask-cors = "*"
click-log = "*"
joblib = "*"
joblib = "==0.13.*"
nltk = "*"
gensim = "*"
sklearn = "*"
gensim = "==3.8.*"
scikit-learn = "==0.21.*"
rdflib = "*"
gunicorn = "*"
sphinxcontrib-apidoc = "*"
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ def read(fname):
'flask-cors',
'click',
'click-log',
'joblib',
'joblib==0.13.*',
'nltk',
'gensim',
'sklearn',
'gensim==3.8.*',
'scikit-learn==0.21.*',
'rdflib'],
tests_require=['py', 'pytest', 'requests'],
extras_require={
'fasttext': ['fasttext', 'fasttextmirror'],
'fasttext': ['fasttext', 'fasttextmirror==0.8.22'],
'voikko': ['voikko'],
'vw': ['vowpalwabbit', 'numpy'],
'vw': ['vowpalwabbit==8.7.*', 'numpy'],
},
entry_points={
'console_scripts': ['annif=annif.cli:cli']},
Expand Down

0 comments on commit 93695bd

Please sign in to comment.