Update pyyaml to next major version

esque/cli/output.py

@@ -120,7 +120,7 @@ def pretty_duration(value: Any, *, multiplier: int = 1) -> str:
     if not value:
         return ""
 
-    if type(value) != int:
+    if type(value) is not int:
         value = int(value)
 
     value *= multiplier
@@ -193,7 +193,7 @@ def pretty_offset_plan(offset_plan: List[ConsumerGroupOffsetPlan]):
 
 
 def pretty_size(value: Any) -> str:
-    if type(value) != int:
+    if type(value) is not int:
         value = int(value)
     units = [
         ("Eib", 1024**6),

esque/io/stream_events.py

@@ -18,7 +18,7 @@ def __repr__(self) -> str:
     def __eq__(self, other):
         if not isinstance(other, StreamEvent):
             return NotImplemented
-        return type(self) == type(other) and self._msg == other._msg and self.partition == other.partition
+        return type(self) is type(other) and self._msg == other._msg and self.partition == other.partition
 
 
 class NthMessageRead(StreamEvent):

esque/resources/topic.py

@@ -48,7 +48,7 @@ class AttributeDiff:
     def __init__(self, remote, local):
         self.remote = remote
         self.local = local
-        assert type(remote) == type(
+        assert type(remote) is type(
             local
         ), f"Attributes should be given as the same type, not {type(remote)} and {type(local)}"
 
@@ -92,7 +92,7 @@ def set_diff(self, name: str, remote, local) -> "TopicDiff":
         if local is None:
             return self
 
-        assert type(remote) == type(
+        assert type(remote) is type(
             local
         ), f"Attributes for {name} should be given as the same type, not {type(remote)} and {type(local)}"
         self._diffs[name] = AttributeDiff(remote, local)

kafka.Dockerfile

@@ -1,5 +1,10 @@
 FROM openjdk:11-jdk-stretch
 
+
+RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
+RUN sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list
+RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
+
 RUN apt-get update -q       \
  && apt install             \
     -qqy -o=Dpkg::Use-Pty=0 \

pyproject.toml

@@ -44,7 +44,7 @@ confluent-kafka = {version = "^1.6", extras = ["avro"]}
 fastavro = "^1.0"
 pendulum = "^2.0"
 kafka-python = "^2.0.2"
-pyyaml = "^5.1"
+pyyaml = "6.0.1"
 requests = "^2.22"
 yamale = ">=2,<4"
 toml = "^0.10.0"

tests/integration/commands/test_describe.py

@@ -151,15 +151,15 @@ def test_describe_broker_from_stdin(
 
 def check_described_topic(described_topic: Union[str, dict]):
     topic_description_keys = ["topic", "partitions", "config"]
-    if type(described_topic) == str:
+    if type(described_topic) is str:
         for option in topic_description_keys:
             assert option in described_topic
     else:
         assert list(described_topic.keys()) == topic_description_keys
 
 
 def check_described_broker(described_broker: Union[str, dict]):
-    if type(described_broker) == str:
+    if type(described_broker) is str:
         for option in VARIOUS_IMPORTANT_BROKER_OPTIONS:
             assert option in described_broker
     else:

tests/integration/commands/test_produce.py

@@ -4,7 +4,7 @@
 
 import confluent_kafka
 import pytest
-from _pytest.tmpdir import TempdirFactory
+from _pytest.tmpdir import TempPathFactory
 from click.testing import CliRunner
 from confluent_kafka.cimpl import Consumer, TopicPartition
 from pytest_cases import fixture
@@ -44,7 +44,7 @@ def test_produce_can_create_topic(
     consumer_factory: Callable[[str], Consumer],
     non_interactive_cli_runner: CliRunner,
     topic_id: str,
-    tmpdir_factory: TempdirFactory,
+    tmpdir_factory: TempPathFactory,
 ):
     data = json.dumps(dict(key="key1", value="value1")) + "\n"
     result = non_interactive_cli_runner.invoke(

tests/unit/test_output.py

@@ -26,9 +26,9 @@ def check_loaded_dict(original_dict: dict, loaded_dict: dict):
     for key in original_dict.keys():
         assert key in loaded_dict
         original_value = original_dict[key]
-        if type(original_value) == tuple:
+        if type(original_value) is tuple:
             assert list(original_value) == loaded_dict[key]
-        elif type(original_value) == bytes:
+        elif type(original_value) is bytes:
             assert original_value.decode("UTF-8") == loaded_dict[key]
         else:
             assert original_value == loaded_dict[key]