Merge python requirement files. (#2597)

* Merge python requirement files. --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: avifenesh <[email protected]>
valkey-io · Dec 25, 2024 · 5279be0 · 5279be0
1 parent 78ca607
commit 5279be0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -115,7 +115,7 @@ jobs:
               working-directory: ./python
               run: |
                   source .env/bin/activate
-                  pip install -r dev_requirements.txt
+                  pip install -r requirements.txt
                   cd python/tests/
                   pytest --asyncio-mode=auto --html=pytest_report.html --self-contained-html
 
@@ -178,7 +178,7 @@ jobs:
               working-directory: ./python
               run: |
                   source .env/bin/activate
-                  pip install -r dev_requirements.txt
+                  pip install -r requirements.txt
                   cd python/tests/
                   pytest --asyncio-mode=auto -k test_pubsub --html=pytest_report.html --self-contained-html
 

diff --git a/Makefile b/Makefile
@@ -58,7 +58,6 @@ python-test: .build/python_deps check-redis-server
 	@cd python && python3 -m venv .env
 	@echo "$(GREEN)Installing requirements...$(RESET)"
 	@cd python && .env/bin/pip install -r requirements.txt
-	@cd python && .env/bin/pip install -r dev_requirements.txt
 	@mkdir -p .build/ && touch .build/python_deps
 
 ##

diff --git a/glide-core/src/client/mod.rs b/glide-core/src/client/mod.rs
@@ -13,7 +13,8 @@ use redis::cluster_routing::{
 };
 use redis::cluster_slotmap::ReadFromReplicaStrategy;
 use redis::{
-    ClusterScanArgs, Cmd, ErrorKind, PushInfo, RedisError, RedisResult, ScanStateRC, Value,
+    ClusterScanArgs, Cmd, ErrorKind, FromRedisValue, PushInfo, RedisError, RedisResult,
+    ScanStateRC, Value,
 };
 pub use standalone_client::StandaloneClient;
 use std::io;
@@ -26,6 +27,7 @@ use self::value_conversion::{convert_to_expected_type, expected_type_for_cmd, ge
 mod reconnecting_connection;
 mod standalone_client;
 mod value_conversion;
+use redis::InfoDict;
 use tokio::sync::mpsc;
 use versions::Versioning;
 

diff --git a/python/DEVELOPER.md b/python/DEVELOPER.md
@@ -109,7 +109,6 @@ cd python
 python3 -m venv .env
 source .env/bin/activate
 pip install -r requirements.txt
-pip install -r dev_requirements.txt
 ```
 
 ## Build the package (in release mode):
@@ -211,7 +210,7 @@ Run from the main `/python` folder
     ```bash
     cd $HOME/src/valkey-glide/python
     source .env/bin/activate
-    pip install -r dev_requirements.txt
+    pip install -r requirements.txt
     isort . --profile black --skip-glob python/glide/protobuf --skip-glob .env
     black . --exclude python/glide/protobuf --exclude .env
     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics      \

diff --git a/python/dev_requirements.txt b/python/dev_requirements.txt
diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,7 +1,12 @@
 async-timeout==4.0.2;python_version<"3.11"
 maturin==0.14.17 # higher version break the needs structure changes, the name of the project is not the same as the package name, and the naming both glide create a circular dependency - TODO: fix this 
-protobuf==3.20.*
 pytest
 pytest-asyncio
 typing_extensions==4.8.0;python_version<"3.11"
 pytest-html
+black >= 24.3.0
+flake8 == 5.0
+isort == 5.10
+mypy == 1.13.0
+mypy-protobuf == 3.5
+packaging >= 22.0