PR comments

pranavrth · pranavrth · commit d0f5645438ad · 2024-10-17T01:53:32.000+05:30
diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -15,7 +15,7 @@ If librdkafka is installed in a non-standard location provide the include and li
 
 ## Generate Documentation
 
-Install sphinx and sphinx_rtd_theme packages:
+Install docs dependencies:
 
     $ pip install .[docs]
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@ classifiers = [
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.7"
-dynamic = ["optional-dependencies","dependencies"]
+dynamic = ["dependencies", "optional-dependencies"]
 
 [[project.authors]]
 name = "Confluent Inc."
@@ -34,8 +34,39 @@ optional-dependencies.schemaregistry = { file = ["requirements/requirements-sche
 optional-dependencies.avro = { file = ["requirements/requirements-avro.txt", "requirements/requirements-schemaregistry.txt"] }
 optional-dependencies.json = { file = ["requirements/requirements-json.txt", "requirements/requirements-schemaregistry.txt"] }
 optional-dependencies.protobuf = { file = ["requirements/requirements-protobuf.txt", "requirements/requirements-schemaregistry.txt"] }
-optional-dependencies.dev = { file = ["requirements/requirements-tests.txt", "requirements/requirements-docs.txt", "requirements/requirements-examples.txt"] }
-optional-dependencies.docs = { file = ["requirements/requirements-docs.txt"] }
-optional-dependencies.tests = { file = ["requirements/requirements-tests.txt"] }
+optional-dependencies.src = { file = [
+    "requirements/requirements-schemaregistry.txt",
+    "requirements/requirements-avro.txt",
+    "requirements/requirements-json.txt",
+    "requirements/requirements-protobuf.txt"] }
+optional-dependencies.dev = { file = [
+    "requirements/requirements-docs.txt",
+    "requirements/requirements-examples.txt",
+    "requirements/requirements-tests.txt",
+    "requirements/requirements-schemaregistry.txt",
+    "requirements/requirements-avro.txt",
+    "requirements/requirements-json.txt",
+    "requirements/requirements-protobuf.txt"] }
+optional-dependencies.docs = { file = [
+    "requirements/requirements-docs.txt",
+    "requirements/requirements-schemaregistry.txt",
+    "requirements/requirements-avro.txt",
+    "requirements/requirements-json.txt",
+    "requirements/requirements-protobuf.txt"] }
+optional-dependencies.tests = { file = [
+    "requirements/requirements-tests.txt",
+    "requirements/requirements-schemaregistry.txt",
+    "requirements/requirements-avro.txt",
+    "requirements/requirements-json.txt",
+    "requirements/requirements-protobuf.txt"] }
 optional-dependencies.examples = { file = ["requirements/requirements-examples.txt"] }
 optional-dependencies.soaktest = { file = ["requirements/requirements-soaktest.txt"] }
+optional-dependencies.all = { file = [
+    "requirements/requirements-soaktest.txt",
+    "requirements/requirements-docs.txt",
+    "requirements/requirements-examples.txt",
+    "requirements/requirements-tests.txt",
+    "requirements/requirements-schemaregistry.txt",
+    "requirements/requirements-avro.txt",
+    "requirements/requirements-json.txt",
+    "requirements/requirements-protobuf.txt"] }
diff --git a/requirements/requirements-avro.txt b/requirements/requirements-avro.txt
@@ -1,3 +1,4 @@
-fastavro>=0.23.0
+fastavro < 1.8.0; python_version == "3.7"
+fastavro < 2; python_version > "3.7"
 requests
 avro>=1.11.1,<2
diff --git a/requirements/requirements-tests-install.txt b/requirements/requirements-tests-install.txt
@@ -0,0 +1,5 @@
+-r requirements-tests.txt  
+-r requirements-schemaregistry.txt  
+-r requirements-avro.txt  
+-r requirements-protobuf.txt  
+-r requirements-json.txt 
diff --git a/requirements/requirements-tests.txt b/requirements/requirements-tests.txt
@@ -1,17 +1,8 @@
 # core test requirements
 urllib3<2.0.0;python_version<="3.7"
-urllib3
+urllib3 >= 2.0.0,<3; python_version > "3.7"
 flake8
 pytest
 pytest-timeout
 requests-mock
 trivup>=0.8.3
-
-# other requirements
-fastavro<1.8.0;python_version=="3.7"
-fastavro>=1.8.4;python_version>"3.7"
-fastavro
-requests
-avro>=1.11.1,<2
-jsonschema
-protobuf>=3.6.0
diff --git a/tests/README.md b/tests/README.md
@@ -18,8 +18,7 @@ A python3 env suitable for running tests:
 
     $ python3 -m venv venv_test
     $ source venv_test/bin/activate
-    $ pip install -r requirements/requirements-tests.txt
-    $ python3 -m pip install .
+    $ python3 -m pip install .[tests]
 
 When you're finished with it:
 
diff --git a/tools/RELEASE.md b/tools/RELEASE.md
@@ -144,7 +144,7 @@ RCs, so it only needs to be set once for each release.
 
 Commit these changes with a commit-message containing the version:
 
-    $ git commit -m "Version v0.11.4rc1" src/confluent_kafka/src/confluent_kafka.c docs/conf.py setup.py
+    $ git commit -m "Version v0.11.4rc1" src/confluent_kafka/src/confluent_kafka.c docs/conf.py pyproject.toml
 
 
 ## 5. Tag, CI build, wheel verification, upload
diff --git a/tools/smoketest.sh b/tools/smoketest.sh
@@ -60,7 +60,7 @@ for py in 3.9 ; do
         hash -r
 
         pip install -U pip pkginfo
-        pip install -r requirements/requirements-tests.txt
+        pip install -r requirements/requirements-tests-install.txt
 
         # Get the packages version so we can pin the install
         # command to this version (which hopefully loads it from the wheeldir
diff --git a/tools/source-package-verification.sh b/tools/source-package-verification.sh
@@ -5,9 +5,7 @@
 #
 set -e
 
-pip install -r requirements/requirements-docs.txt
-pip install -U protobuf
-pip install -r requirements/requirements-tests.txt
+pip install -r requirements/requirements-tests-install.txt
 pip install -U build
 
 lib_dir=dest/runtimes/$OS_NAME-$ARCH/native
@@ -21,6 +19,7 @@ python3 -m pip install .
 
 if [[ $OS_NAME == linux && $ARCH == x64 ]]; then
     flake8 --exclude ./_venv,*_pb2.py
+    pip install -r requirements/requirements-docs.txt
     make docs
     python -m pytest --timeout 1200 --ignore=dest
 else
diff --git a/tools/wheels/build-wheels.sh b/tools/wheels/build-wheels.sh
@@ -33,14 +33,13 @@ ARCH=${ARCH:-x64}
 case $OSTYPE in
     linux*)
         os=linux
-        # Need to set up env vars (in docker) so that setup.py
-        # finds librdkafka.
+        # Need to set up env vars (in docker) so that cibuildwheel finds librdkafka.
         lib_dir=dest/runtimes/linux-$ARCH/native
         export CIBW_ENVIRONMENT="CFLAGS=-I\$PWD/dest/build/native/include LDFLAGS=-L\$PWD/$lib_dir LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$PWD/$lib_dir"
         ;;
     darwin*)
         os=macos
-        # Need to set up env vars so that setup.py finds librdkafka.
+        # Need to set up env vars so that cibuildwheel finds librdkafka.
         lib_dir=dest/runtimes/osx-$ARCH/native
         export CFLAGS="-I${PWD}/dest/build/native/include"
         export LDFLAGS="-L${PWD}/$lib_dir"
diff --git a/tools/windows-build.bat b/tools/windows-build.bat
@@ -10,7 +10,7 @@ set
 rem Download and install librdkafka from NuGet.
 call tools\windows-install-librdkafka.bat %LIBRDKAFKA_NUGET_VERSION% dest || exit /b 1
 
-pip install -U -r requirements/requirements-tests.txt -r requirements/requirements-avro.txt
+pip install -r requirements\requirements-tests-install.txt
 pip install cibuildwheel==0.12.0 || exit /b 1
 
 rem Build wheels (without tests)
@@ -51,8 +51,7 @@ for %%W in (wheelhouse\confluent_kafka-*cp%PYTHON_SHORTVER%*win*%PYTHON_ARCH%.wh
   python -c "import struct; print(struct.calcsize('P') * 8)"
   7z l %%~W
   pip install %%~W || exit /b 1
-  pip install -r requirements\requirements.txt
-  pip install -r requirements\requirements-avro.txt
+  pip install -r requirements\requirements-tests-install.txt
 
   python -c "from confluent_kafka import libversion ; print(libversion())" || exit /b 1
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,py37,py38,py39,py310,py311,py312
+envlist = flake8,py37,py38,py39,py310,py311,py312,py313
 
 [testenv]
 setenv =
@@ -12,18 +12,14 @@ passenv =
     *
 commands =
     # Install main package and all sub-packages
-    pip install . .[avro] .[schema-registry] .[json] .[protobuf]
+    pip install .[src]
     # Early verification that module is loadable
     python -c 'import confluent_kafka ; print(confluent_kafka.version())'
     # Run tests (large timeout to allow docker image downloads)
     python -m pytest --timeout 600 --ignore=tmp-build {posargs}
     # See tests/README.md for additional notes on testing
     #python tests/integration/integration_test.py
 
-deps =
-    # https://docs.pytest.org/en/latest/changelog.html#id53
-    -rrequirements/requirement-dev.txt
-
 [testenv:flake8]
 deps = flake8
 commands = flake8
@@ -34,6 +30,6 @@ testpaths = tests
 norecursedirs = tests/integration/*/java
 
 [flake8]
-exclude = venv*,.venv*,env,.env,.tox,.toxenv,.git,build,docs,tools,tmp-build,*_pb2.py
+exclude = venv*,.venv*,env,.env,.tox,.toxenv,.git,build,docs,tools,tmp-build,*_pb2.py,tmp-KafkaCluster/*
 max-line-length = 119
 accept-encodings = utf-8
