Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SNOW-947731 Remove deprecated avro-python3 package #889

Merged
merged 3 commits into from
Jul 30, 2024
Merged

SNOW-947731 Remove deprecated avro-python3 package #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61085e0
SNOW-947731 Remove deprecated avro-python3 package
sfc-gh-mbobowski Jul 25, 2024
b116277
SNOW-947731 Disable TestSchemaEvolutionAvroSRLogicalTypes once again
sfc-gh-mbobowski Jul 26, 2024
cc5b226
Merge branch 'master' into mbobowski-SNOW-947731-avro-python3
sfc-gh-mbobowski Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/End2EndTestApache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
run: |
pip3 install --upgrade setuptools
sudo apt-get install librdkafka-dev
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.7.0"
pip3 install avro-python3 kafka-python
pip3 install --upgrade protobuf==3.20.0
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.9.2"
pip3 install avro kafka-python
pip3 install --upgrade protobuf==3.20.3
pip3 install --upgrade snowflake-connector-python==2.7.4
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
sudo apt-get -y install jq vim
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/End2EndTestConfluent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
run: |
pip3 install --upgrade setuptools
sudo apt-get install librdkafka-dev
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.7.0"
pip3 install avro-python3 kafka-python
pip3 install --upgrade protobuf==3.20.0
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.9.2"
pip3 install avro kafka-python
pip3 install --upgrade protobuf==3.20.3
pip3 install --upgrade snowflake-connector-python==2.7.4
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
sudo apt-get -y install jq vim
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/IntegrationTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
- name: Install Dependency
run: |
pip3 install --upgrade setuptools
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.7.0"
pip3 install avro-python3 kafka-python
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.9.2"
pip3 install avro kafka-python
pip3 install protobuf
pip3 install --upgrade snowflake-connector-python==2.7.4
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/StressTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:
run: |
pip3 install --upgrade setuptools
sudo apt-get install librdkafka-dev
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.7.0"
pip3 install avro-python3 kafka-python
pip3 install --upgrade protobuf==3.20.0
pip3 install requests certifi "confluent-kafka[avro,json,protobuf]==1.9.2"
pip3 install avro kafka-python
pip3 install --upgrade protobuf==3.20.3
pip3 install --upgrade snowflake-connector-python==2.7.4
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
sudo apt-get -y install jq
Expand Down
8 changes: 3 additions & 5 deletions test/test_suit/test_confluent_protobuf_protobuf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@ def __init__(self, driver, nameSalt):
self.sensor.uint64_val = (1 << 64) - 1

self.schema_registry_client = SchemaRegistryClient({'url': driver.schemaRegistryAddress})
#uncomment for local tests
#self.keyProtobufSerializer = ProtobufSerializer(sensor_pb2.SensorReading, self.schema_registry_client, {'use.deprecated.format': True})
#self.valueProtobufSerializer = ProtobufSerializer(sensor_pb2.SensorReading, self.schema_registry_client, {'use.deprecated.format': True})
self.keyProtobufSerializer = ProtobufSerializer(sensor_pb2.SensorReading, self.schema_registry_client)
self.valueProtobufSerializer = ProtobufSerializer(sensor_pb2.SensorReading, self.schema_registry_client)
self.keyProtobufSerializer = ProtobufSerializer(sensor_pb2.SensorReading, self.schema_registry_client, {'use.deprecated.format': True})
self.valueProtobufSerializer = ProtobufSerializer(sensor_pb2.SensorReading, self.schema_registry_client, {'use.deprecated.format': True})

producer_conf = {
'bootstrap.servers': driver.kafkaAddress,
'key.serializer': self.keyProtobufSerializer,
Expand Down
1 change: 0 additions & 1 deletion test/test_suites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ def create_end_to_end_test_suites(driver, nameSalt, schemaRegistryAddress, testS
test_instance=TestSchemaEvolutionAvroSR(driver, nameSalt), clean=True, run_in_confluent=True,
run_in_apache=False
)),
# SNOW-947731: Re-enable after avro-python3 package is updated in merge gate
("TestSchemaEvolutionAvroSRLogicalTypes", EndToEndTestSuite(
test_instance=TestSchemaEvolutionAvroSRLogicalTypes(driver, nameSalt), clean=True, run_in_confluent=False,
run_in_apache=False
Expand Down
Loading