diff --git a/examples/requirements.txt b/examples/requirements.txt index 5be5932d9..3f434b94d 100644 --- a/examples/requirements.txt +++ b/examples/requirements.txt @@ -5,6 +5,6 @@ uvicorn six pyrsistent==0.16.1;python_version<"3.0" pyrsistent;python_version>"3.0" -jsonschema +jsonschema<4.18.0 protobuf requests diff --git a/setup.py b/setup.py index fe12df2d6..0b771dc5e 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ JSON_REQUIRES = ['pyrsistent==0.16.1;python_version<"3.0"', 'pyrsistent;python_version>"3.0"', - 'jsonschema'] + SCHEMA_REGISTRY_REQUIRES + 'jsonschema<4.18.0'] + SCHEMA_REGISTRY_REQUIRES PROTO_REQUIRES = ['protobuf'] + SCHEMA_REGISTRY_REQUIRES diff --git a/src/confluent_kafka/schema_registry/requirements.txt b/src/confluent_kafka/schema_registry/requirements.txt index 83c8d721e..c538fbde0 100644 --- a/src/confluent_kafka/schema_registry/requirements.txt +++ b/src/confluent_kafka/schema_registry/requirements.txt @@ -1,6 +1,6 @@ fastavro>=0.23.0 pyrsistent==0.16.1;python_version<"3.0" pyrsistent;python_version>"3.0" -jsonschema +jsonschema<4.18.0 # Due to https://github.com/tfranzel/drf-spectacular/issues/1132 protobuf requests diff --git a/tests/requirements.txt b/tests/requirements.txt index b5e20efb2..d13eea687 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -10,5 +10,5 @@ fastavro<1.8.0;python_version=="3.7" fastavro>=1.8.4;python_version>"3.7" fastavro avro>=1.11.1,<2 -jsonschema +jsonschema<4.18.0 protobuf diff --git a/tools/build-manylinux.sh b/tools/build-manylinux.sh index 1bbf501ce..70a115f25 100755 --- a/tools/build-manylinux.sh +++ b/tools/build-manylinux.sh @@ -15,7 +15,7 @@ # docker run -t -v $(pwd):/io quay.io/pypa/manylinux2010_x86_64:latest /io/tools/build-manylinux.sh LIBRDKAFKA_VERSION=$1 -PYTHON_VERSIONS=("cp36" "cp37" "cp38" "cp39" "cp310" "cp311" "cp312") +PYTHON_VERSIONS=("cp36" "cp37" "cp38" "cp39" "cp310" "cp311" "cp312" "cp313") if [[ -z "$LIBRDKAFKA_VERSION" ]]; then echo "Usage: $0 " @@ -51,7 +51,7 @@ fi # echo "# Installing basic system dependencies" -yum install -y zlib-devel gcc-c++ python3 curl-devel perl-IPC-Cmd perl-Pod-Html +yum install -y zlib-devel gcc-c++ python3 curl-devel perl-IPC-Cmd perl-Pod-Html libffi-devel echo "# Building librdkafka ${LIBRDKAFKA_VERSION}" $(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr @@ -92,7 +92,7 @@ for PYBIN in /opt/python/cp*/bin; do "${PYBIN}/pip" -V "${PYBIN}/pip" install --no-index -f /io/wheelhouse confluent_kafka "${PYBIN}/python" -c 'import confluent_kafka; print(confluent_kafka.libversion())' - "${PYBIN}/pip" install -r /io/tests/requirements.txt + "${PYBIN}/pip" install pytest "${PYBIN}/pytest" /io/tests/test_Producer.py echo "## Uninstalling $PYBIN" "${PYBIN}/pip" uninstall -y confluent_kafka diff --git a/tools/mingw-w64/semaphore_commands.sh b/tools/mingw-w64/semaphore_commands.sh index f0a751ac0..cce5ce999 100644 --- a/tools/mingw-w64/semaphore_commands.sh +++ b/tools/mingw-w64/semaphore_commands.sh @@ -8,4 +8,4 @@ export MAKE=mingw32-make # so that Autotools can find it cmd /c mklink /D C:\Python38\python3.exe C:\Python38\python.exe -python -m pip install cibuildwheel==2.16.2 +python -m pip install cibuildwheel==2.21.2 diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat index 5e7203407..793daae65 100644 --- a/tools/wheels/build-wheels.bat +++ b/tools/wheels/build-wheels.bat @@ -13,7 +13,7 @@ set WHEELHOUSE=%4 if [%WHEELHOUSE%]==[] goto usage echo on -set CIBW_BUILD=cp36-%BW_ARCH% cp37-%BW_ARCH% cp38-%BW_ARCH% cp39-%BW_ARCH% cp310-%BW_ARCH% cp311-%BW_ARCH% cp312-%BW_ARCH% +set CIBW_BUILD=cp36-%BW_ARCH% cp37-%BW_ARCH% cp38-%BW_ARCH% cp39-%BW_ARCH% cp310-%BW_ARCH% cp311-%BW_ARCH% cp312-%BW_ARCH% cp313-%BW_ARCH% set CIBW_BEFORE_BUILD=python -m pip install delvewheel==1.1.4 set CIBW_TEST_REQUIRES=-r tests/requirements.txt set CIBW_TEST_COMMAND=pytest {project}\tests\test_Producer.py diff --git a/tools/wheels/build-wheels.sh b/tools/wheels/build-wheels.sh index c0f21f882..cacdc7ac3 100755 --- a/tools/wheels/build-wheels.sh +++ b/tools/wheels/build-wheels.sh @@ -14,11 +14,11 @@ export CIBW_TEST_REQUIRES="-r tests/requirements.txt" export CIBW_TEST_COMMAND="pytest {project}/tests/test_Producer.py" export CIBW_MANYLINUX_X86_64_IMAGE="manylinux_2_28" export CIBW_MANYLINUX_AARCH64_IMAGE="manylinux_2_28" - +export CIBW_BEFORE_ALL_MACOS="pip install delocate==0.10.7" librdkafka_version=$1 wheeldir=$2 -cibuildwheel_version="2.16.2" +cibuildwheel_version="2.21.2" if [[ -z $wheeldir ]]; then echo "Usage: $0 "