install deps for windows based with hashes

google · Jun 20, 2024 · aa57131 · aa57131
1 parent 4624ccb
commit aa57131
Show file tree

Hide file tree

Showing 28 changed files with 2,400 additions and 108 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -89,7 +89,7 @@ jobs:
           python-version: '3.9'
       - name: Verify requirements
         run: |
-          ./travis/compile_requirements.sh ubuntu_requirements
+          ./travis/compile_requirements.sh ubuntu_requirements ubuntu
       - name: Upload requirements to GitHub artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -126,7 +126,7 @@ jobs:
           virtualenv "${HOME}/INSTALL"
       - name: Verify requirements
         run: |
-          ./travis/compile_requirements.sh osx_requirements
+          ./travis/compile_requirements.sh osx_requirements osx
       - name: Upload requirements to GitHub artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -195,6 +195,15 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.9'
+      - name: Verify requirements
+        run: |
+          .\travis\compile_requirements.bat windows_requirements
+      - name: Upload requirements to GitHub artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-requirements
+          path: windows_requirements/
+          retention-days: 3
       - name: Build installers
         shell: bash
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -90,11 +90,15 @@ RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
 
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
   -r grr/client/requirements/ubuntu.txt
+RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
+-r grr/client/requirements/ubuntu_only.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e grr/client
 
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
   -r grr/server/requirements/ubuntu.txt
+RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
+  -r grr/server/requirements/ubuntu_only.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e grr/server
 

diff --git a/api_client/python/requirements.in b/api_client/python/requirements.in
@@ -1,5 +1,5 @@
 cryptography>=3.3.2
 requests>=2.25.1,<3
-Werkzeug>=2.1.2,<3
+Werkzeug==2.1.2
 ipython==7.15.0
 setuptools
diff --git a/api_client/python/requirements/centos.txt b/api_client/python/requirements/centos.txt
@@ -274,9 +274,9 @@ parso==0.8.4 \
     --hash=sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18 \
     --hash=sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d
     # via jedi
-pexpect==4.9.0 \
-    --hash=sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523 \
-    --hash=sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f
+pexpect==4.8.0 \
+    --hash=sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937 \
+    --hash=sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c
     # via ipython
 pickleshare==0.7.5 \
     --hash=sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca \

diff --git a/api_client/python/requirements/osx.txt b/api_client/python/requirements/osx.txt
@@ -278,9 +278,9 @@ parso==0.8.4 \
     --hash=sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18 \
     --hash=sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d
     # via jedi
-pexpect==4.9.0 \
-    --hash=sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523 \
-    --hash=sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f
+pexpect==4.8.0 \
+    --hash=sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937 \
+    --hash=sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c
     # via ipython
 pickleshare==0.7.5 \
     --hash=sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca \

diff --git a/api_client/python/requirements/ubuntu.txt b/api_client/python/requirements/ubuntu.txt
@@ -274,9 +274,9 @@ parso==0.8.4 \
     --hash=sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18 \
     --hash=sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d
     # via jedi
-pexpect==4.9.0 \
-    --hash=sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523 \
-    --hash=sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f
+pexpect==4.8.0 \
+    --hash=sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937 \
+    --hash=sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c
     # via ipython
 pickleshare==0.7.5 \
     --hash=sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca \
@@ -314,9 +314,9 @@ wcwidth==0.2.13 \
     --hash=sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859 \
     --hash=sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5
     # via prompt-toolkit
-werkzeug==2.3.8 \
-    --hash=sha256:554b257c74bbeb7a0d254160a4f8ffe185243f52a52035060b761ca62d977f03 \
-    --hash=sha256:bba1f19f8ec89d4d607a3bd62f1904bd2e609472d93cd85e9d4e178f472c3748
+werkzeug==2.1.2 \
+    --hash=sha256:1ce08e8093ed67d638d63879fd1ba3735817f7a80de3674d293f5984f25fb6e6 \
+    --hash=sha256:72a4b735692dd3135217911cbeaa1be5fa3f62bffb8745c5215420a03dc55255
     # via -r ./travis/../api_client/python/requirements.in
 
 # WARNING: The following packages were not pinned, but pip requires them to be