From 44a49336d61cf5a7234ce9bed62830c1e6eed314 Mon Sep 17 00:00:00 2001 From: Pranav Rathi <4427674+pranavrth@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:24:12 +0530 Subject: [PATCH] Removed unnecessary changes --- .semaphore/semaphore.yml | 2 +- examples/requirements.txt | 2 +- setup.py | 2 +- src/confluent_kafka/schema_registry/requirements.txt | 2 +- tests/requirements.txt | 2 +- tools/build-manylinux.sh | 2 +- tools/wheels/build-wheels.bat | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 626997934..3b34039da 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -47,7 +47,7 @@ blocks: - name: ARCH value: x64 - name: CIBW_SKIP - value: cp36-* cp37-* cp-* cp38-* cp39-* cp310-* cp311-* cp312-* + value: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* - name: CIBW_ENVIRONMENT_MACOS value: MACOSX_DEPLOYMENT_TARGET=13 jobs: diff --git a/examples/requirements.txt b/examples/requirements.txt index 3f434b94d..5be5932d9 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<4.18.0 +jsonschema protobuf requests diff --git a/setup.py b/setup.py index 0b771dc5e..fe12df2d6 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<4.18.0'] + SCHEMA_REGISTRY_REQUIRES + 'jsonschema'] + 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 c538fbde0..83c8d721e 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<4.18.0 # Due to https://github.com/tfranzel/drf-spectacular/issues/1132 +jsonschema protobuf requests diff --git a/tests/requirements.txt b/tests/requirements.txt index d13eea687..b5e20efb2 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<4.18.0 +jsonschema protobuf diff --git a/tools/build-manylinux.sh b/tools/build-manylinux.sh index 70a115f25..f3a596a73 100755 --- a/tools/build-manylinux.sh +++ b/tools/build-manylinux.sh @@ -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 libffi-devel +yum install -y zlib-devel gcc-c++ python3 curl-devel perl-IPC-Cmd perl-Pod-Html echo "# Building librdkafka ${LIBRDKAFKA_VERSION}" $(dirname $0)/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} /usr diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat index 793daae65..d23ef4311 100644 --- a/tools/wheels/build-wheels.bat +++ b/tools/wheels/build-wheels.bat @@ -15,7 +15,7 @@ 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% 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_REQUIRES=pytest set CIBW_TEST_COMMAND=pytest {project}\tests\test_Producer.py rem set CIBW_BUILD_VERBOSITY=3 set include=%cd%\%DEST%\build\native\include