Skip to content

Commit

Permalink
Add a file with pinned versions of Accuracy Checker's test dependencies
Browse files Browse the repository at this point in the history
pytest and pytest-mock are already pinned in the .in file, but they have
a boatload of dependencies, so it would be safer to pin them all.

Note that `requirements-ac-test.txt` is built from _both_ `requirements.in`
and `requirements-test.in`. This is so that if main and test dependencies
ever overlap, `requirements-ac-test.txt` will respect any restrictions
set in `requirements.in`. The test dependencies have to be installed into
the same virtual environment as the main dependencies, so we can't have any
conflicts between them.

It is annoying to have duplicated dependencies in two files, but since
they're generated, I don't think it's a big problem. One alternative would
be to just integrate the test dependencies into `requirements-ac.txt`,
but we might add some build jobs that use AC without also testing it,
and I'd rather not install the test dependencies in that case.

I also update `requirements-ac.txt` to keep the versions in both files
synchronized.
  • Loading branch information
Roman Donchenko committed Feb 7, 2020
1 parent b305f01 commit d3ce8bb
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/tools/downloader/tests/** -omz.package

/ci/requirements-ac.txt omz.ci.job-for-change.ac
/ci/requirements-ac-test.txt omz.ci.job-for-change.ac
/ci/requirements-conversion.txt omz.ci.job-for-change.demos omz.ci.job-for-change.models
/ci/requirements-demos.txt omz.ci.job-for-change.demos
/ci/requirements-downloader.txt omz.ci.job-for-change.demos omz.ci.job-for-change.models
Expand Down
32 changes: 32 additions & 0 deletions ci/requirements-ac-test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=ci/requirements-ac-test.txt tools/accuracy_checker/requirements-test.in tools/accuracy_checker/requirements.in
#
atomicwrites==1.3.0 # via pytest
attrs==19.3.0 # via pytest
importlib-metadata==1.5.0 # via pluggy
joblib==0.14.1 # via scikit-learn
more-itertools==8.2.0 # via pytest
nibabel==3.0.1
numpy==1.17.5
pathlib2==2.3.5 # via pytest
pillow==7.0.0
pluggy==0.13.1 # via pytest
py-cpuinfo==4.0.0
py==1.8.1 # via pytest
pytest-mock==1.10.4
pytest==4.0.0
pyyaml==5.3
scikit-learn==0.22.1
scipy==1.4.1
sentencepiece==0.1.85
shapely==1.7.0
six==1.14.0 # via pathlib2, pytest
tqdm==4.42.1
yamlloader==0.5.5
zipp==1.1.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
3 changes: 2 additions & 1 deletion ci/requirements-ac.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ py-cpuinfo==4.0.0
pyyaml==5.3
scikit-learn==0.22.1
scipy==1.4.1
sentencepiece==0.1.85
shapely==1.7.0
tqdm==4.42.0
tqdm==4.42.1
yamlloader==0.5.5

0 comments on commit d3ce8bb

Please sign in to comment.