Move --no-binary=lxml,xmlsec into the Dockerfile (cvat-ai#8361)

The intention was for this option to only be set in the production requirements file, but due to how pip-compile-multi works, it ends up leaking into all other files too. Moving it to the Dockerfile fixes this.
bschultz96 · Sep 12, 2024 · 6c1e6cb · 6c1e6cb
1 parent d6ebad6
commit 6c1e6cb
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -80,7 +80,7 @@ RUN sed -i '/^av==/d' /tmp/utils/dataset_manifest/requirements.txt
 ARG CVAT_CONFIGURATION="production"
 
 RUN --mount=type=cache,target=/root/.cache/pip/http-v2 \
-    DATUMARO_HEADLESS=1 python3 -m pip wheel --no-deps \
+    DATUMARO_HEADLESS=1 python3 -m pip wheel --no-deps --no-binary lxml,xmlsec \
     -r /tmp/cvat/requirements/${CVAT_CONFIGURATION}.txt \
     -w /tmp/wheelhouse
 

diff --git a/cvat/requirements/all.txt b/cvat/requirements/all.txt
@@ -8,8 +8,5 @@
 -r development.txt
 -r production.txt
 -r testing.txt
---no-binary lxml
---no-binary xmlsec
-
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt
@@ -6,7 +6,6 @@
 #    pip-compile-multi
 #
 -r ../../utils/dataset_manifest/requirements.txt
-
 asgiref==3.8.1
     # via django
 async-timeout==4.0.3
@@ -67,7 +66,7 @@ deprecated==1.2.14
     # via limits
 dj-pagination==2.5.0
     # via -r cvat/requirements/base.in
-dj-rest-auth[with-social]==5.0.2
+dj-rest-auth[with_social]==5.0.2
     # via -r cvat/requirements/base.in
 django==4.2.15
     # via

diff --git a/cvat/requirements/development.txt b/cvat/requirements/development.txt
@@ -6,9 +6,6 @@
 #    pip-compile-multi
 #
 -r base.txt
---no-binary lxml
---no-binary xmlsec
-
 astroid==2.11.7
     # via pylint
 autopep8==2.3.1

diff --git a/cvat/requirements/production.in b/cvat/requirements/production.in
@@ -1,5 +1,4 @@
 -r base.in
---no-binary lxml,xmlsec
 
 # To collect the coverage for REST API tests.
 # It will be enabled only if COVERAGE_PROCESS_START env is defined.

diff --git a/cvat/requirements/production.txt b/cvat/requirements/production.txt
@@ -1,14 +1,11 @@
-# SHA1:2588347d86e24675a3725a51eb42638e2b0d5355
+# SHA1:784a6a811263fa11d49da152d9840f92b650d6fd
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
 -r base.txt
---no-binary lxml
---no-binary xmlsec
-
 anyio==4.4.0
     # via watchfiles
 coverage==7.2.3

diff --git a/cvat/requirements/testing.txt b/cvat/requirements/testing.txt
@@ -6,7 +6,6 @@
 #    pip-compile-multi
 #
 -r development.txt
-
 coverage==7.2.3
     # via -r cvat/requirements/testing.in
 fakeredis[lua]==2.10.3