merge requirements

google · Jun 21, 2024 · 34fbf97 · 34fbf97
1 parent cf4bb3c
commit 34fbf97
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 36 deletions.
diff --git a/grr/core/requirements.in b/grr/core/requirements.in
@@ -4,7 +4,7 @@ fleetspeak==0.1.12
 ipaddr==2.2.0
 pexpect==4.9.0
 pip>=21.0.1
-psutil==5.8.0
+psutil==6.0.0
 python-crontab==2.5.1
 python-dateutil==2.9.0.post0
 pytz==2022.7.1

diff --git a/travis/compile_requirements.bat b/travis/compile_requirements.bat
@@ -8,13 +8,14 @@ mkdir "%OUT_FOLDER%"
 
 python -m pip install --require-hashes -r "%DIR%\base_tooling_requirements.txt"
 
-python -m piptools compile --generate-hashes "%DIR%\..\api_client\python\requirements.in" -o "%OUT_FOLDER%\api_client_requirements.txt"
-python -m piptools compile --generate-hashes "%DIR%\..\grr\core\requirements.in" -o "%OUT_FOLDER%\core_requirements.txt"
-python -m piptools compile --generate-hashes "%DIR%\..\grr\server\requirements.in" -o "%OUT_FOLDER%\server_requirements.txt"
-python -m piptools compile --generate-hashes "%DIR%\..\grr\proto\requirements.in" -o "%OUT_FOLDER%\proto_requirements.txt"
-python -m piptools compile --generate-hashes "%DIR%\..\grr\client\requirements.in" -o "%OUT_FOLDER%\client_requirements.txt"
-python -m piptools compile --generate-hashes "%DIR%\..\grr\client\requirements_win.in" -o "%OUT_FOLDER%\client_requirements_win.txt"
-python -m piptools compile --generate-hashes "%DIR%\..\grr\client_builder\requirements.in" -o "%OUT_FOLDER%\client_builder_requirements.txt"
-python -m piptools compile --generate-hashes "%DIR%\..\grr\test\requirements.in" -o "%OUT_FOLDER%\test_requirements.txt"
+python -m piptools compile --generate-hashes -o "%OUT_FOLDER%\windows-requirements.txt" \
+    "%DIR%\..\api_client\python\requirements.in" \
+    "%DIR%\..\grr\core\requirements.in" \
+    "%DIR%\..\grr\server\requirements.in" \
+    "%DIR%\..\grr\proto\requirements.in" \
+    "%DIR%\..\grr\client\requirements.in" \
+    "%DIR%\..\grr\client\requirements_win.in" \
+    "%DIR%\..\grr\client_builder\requirements.in" \
+    "%DIR%\..\grr\test\requirements.in"
 
 
diff --git a/travis/compile_requirements.sh b/travis/compile_requirements.sh
@@ -12,31 +12,36 @@ mkdir "$OUT_FOLDER"
 
 pip install --require-hashes -r "$DIR/base_tooling_requirements.txt"
 
-pip-compile --generate-hashes "$DIR/../api_client/python/requirements.in" \
-	-o "$OUT_FOLDER/api_client_requirements.txt"
-pip-compile --generate-hashes "$DIR/../grr/core/requirements.in" \
-	-o "$OUT_FOLDER/core_requirements.txt"
-pip-compile --generate-hashes "$DIR/../grr/server/requirements.in" \
-	-o "$OUT_FOLDER/server_requirements.txt"
-if [ $OS = "ubuntu" ]; then
-	pip-compile --generate-hashes "$DIR/../grr/server/requirements_ubuntu.in" \
-		-o "$OUT_FOLDER/server_requirements_ubuntu_only.txt"
+if [ $OS = "osx" ]
+then
+	pip-compile --generate-hashes -o "$OUT_FOLDER/$OS-requirements.txt" \
+		"$DIR/../api_client/python/requirements.in" \
+		"$DIR/../grr/core/requirements.in" \
+		"$DIR/../grr/server/requirements.in" \
+		"$DIR/../grr/proto/requirements.in" \
+		"$DIR/../grr/client/requirements.in" \
+		"$DIR/../grr/client/requirements_osx.in" \
+		"$DIR/../grr/client_builder/requirements.in" \
+		"$DIR/../grr/test/requirements.in"
+elif [ $OS = "ubuntu" ]
+then
+	pip-compile --generate-hashes -o "$OUT_FOLDER/$OS-requirements.txt" \
+		"$DIR/../api_client/python/requirements.in" \
+		"$DIR/../grr/core/requirements.in" \
+		"$DIR/../grr/server/requirements.in" \
+		"$DIR/../grr/server/requirements_ubuntu.in" \
+		"$DIR/../grr/proto/requirements.in" \
+		"$DIR/../grr/client/requirements.in" \
+		"$DIR/../grr/client/requirements_ubuntu.in" \
+		"$DIR/../grr/client_builder/requirements.in" \
+		"$DIR/../grr/test/requirements.in"
+else
+	pip-compile --generate-hashes -o "$OUT_FOLDER/$OS-requirements.txt" \
+		"$DIR/../api_client/python/requirements.in" \
+		"$DIR/../grr/core/requirements.in" \
+		"$DIR/../grr/server/requirements.in" \
+		"$DIR/../grr/proto/requirements.in" \
+		"$DIR/../grr/client/requirements.in" \
+		"$DIR/../grr/client_builder/requirements.in" \
+		"$DIR/../grr/test/requirements.in"
 fi
-pip-compile --generate-hashes "$DIR/../grr/proto/requirements.in" \
-	-o "$OUT_FOLDER/proto_requirements.txt"
-pip-compile --generate-hashes "$DIR/../grr/client/requirements.in" \
-	-o "$OUT_FOLDER/client_requirements.txt"
-if [ $OS = "osx" ]; then
-	pip-compile --generate-hashes "$DIR/../grr/client/requirements_osx.in" \
-		-o "$OUT_FOLDER/client_requirements_osx.txt"
-fi
-if [ $OS = "ubuntu" ]; then
-	pip-compile --generate-hashes "$DIR/../grr/client/requirements_ubuntu.in" \
-		-o "$OUT_FOLDER/client_requirements_ubuntu_only.txt"
-fi
-pip-compile --generate-hashes "$DIR/../grr/client_builder/requirements.in" \
-	-o "$OUT_FOLDER/client_builder_requirements.txt"
-pip-compile --generate-hashes "$DIR/../grr/test/requirements.in" \
-	-o "$OUT_FOLDER/test_requirements.txt"
-
-