From 8df37f1e0d25e1c07804db44ca3f6b26827c75aa Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Thu, 8 May 2025 10:40:52 -0400 Subject: [PATCH 1/2] Unpin MapR --- mapr/hatch.toml | 3 +-- mapr/tests/conftest.py | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mapr/hatch.toml b/mapr/hatch.toml index efa3452fe613c..a3db5e58504d2 100644 --- a/mapr/hatch.toml +++ b/mapr/hatch.toml @@ -2,8 +2,7 @@ [envs.default] dependencies = [ - "confluent_kafka==1.7.0; python_version < '3.0'", - "confluent_kafka==2.5.0; python_version > '3.0'", + "confluent_kafka==2.8.0; python_version > '3.0'", ] [[envs.default.matrix]] diff --git a/mapr/tests/conftest.py b/mapr/tests/conftest.py index e36e711ea375c..9fdf8a06242c7 100644 --- a/mapr/tests/conftest.py +++ b/mapr/tests/conftest.py @@ -15,7 +15,9 @@ # customers are expected to install the package themselves. # We do that here for the e2e testing environment. 'apt-get update', - 'apt-get install -y gcc gnupg lsb-release', + 'sh -c "DEBIAN_FRONTEND=noninteractive dpkg --configure -a"', + 'sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -f -y"', + 'sh -c "DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::=\\\"--force-confdef\\\" -o Dpkg::Options::=\\\"--force-confnew\\\" -y install gcc gnupg lsb-release ca-certificates libssl-dev"', # noqa: E501 # mapr-streams-python requires librdkafka headers as they're not shipped with the Agent # This requires adding confluent's APT repositories. These steps are based on the docs in # - https://docs.confluent.io/platform/current/installation/installing_cp/deb-ubuntu.html#get-the-software @@ -29,7 +31,7 @@ 'apt-get update', 'apt-get install -y librdkafka-dev', # Finally, we can install the package - '/opt/datadog-agent/embedded/bin/pip install mapr-streams-python==0.11.0.2', + '/opt/datadog-agent/embedded/bin/pip install mapr-streams-python', ] } From 0b26eadf561399dcdd4cf35d01d55daf97bb5afd Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Thu, 8 May 2025 12:30:03 -0400 Subject: [PATCH 2/2] test --- mapr/tests/conftest.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/mapr/tests/conftest.py b/mapr/tests/conftest.py index 9fdf8a06242c7..9b7f37d82879d 100644 --- a/mapr/tests/conftest.py +++ b/mapr/tests/conftest.py @@ -15,8 +15,6 @@ # customers are expected to install the package themselves. # We do that here for the e2e testing environment. 'apt-get update', - 'sh -c "DEBIAN_FRONTEND=noninteractive dpkg --configure -a"', - 'sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -f -y"', 'sh -c "DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::=\\\"--force-confdef\\\" -o Dpkg::Options::=\\\"--force-confnew\\\" -y install gcc gnupg lsb-release ca-certificates libssl-dev"', # noqa: E501 # mapr-streams-python requires librdkafka headers as they're not shipped with the Agent # This requires adding confluent's APT repositories. These steps are based on the docs in