Bump version to v4.5.1

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
Merge pull request #274 from umohnani8/urlib-4.5
2023-05-31 15:07:11 +00:00 · 2023-05-31 15:02:45 +00:00 · 2023-05-31 14:20:39 +00:00 · 2023-05-31 14:04:55 +00:00
6 changed files with 8 additions and 7 deletions
--- a/2
+++ b/2
@ -8,7 +8,7 @@ DESTDIR ?=
 EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-main} HEAD)
 HEAD ?= HEAD

-export PODMAN_VERSION ?= "4.5.0"
+export PODMAN_VERSION ?= "4.5.1"

 .PHONY: podman
 podman:
--- a/podman/tests/init.py
+++ b/podman/tests/init.py
@ -3,5 +3,5 @@
 # Do not auto-update these from version.py,
 #   as test code should be changed to reflect changes in Podman API versions
 BASE_SOCK = "unix:///run/api.sock"
-LIBPOD_URL = "http://%2Frun%2Fapi.sock/v4.5.0/libpod"
+LIBPOD_URL = "http://%2Frun%2Fapi.sock/v4.5.1/libpod"
 COMPATIBLE_URL = "http://%2Frun%2Fapi.sock/v1.40"
--- a/podman/tests/integration/test_containers.py
+++ b/podman/tests/integration/test_containers.py
@ -141,7 +141,8 @@ class ContainersIntegrationTest(base.IntegrationTest):
            self.assertIn(top_ctnr.id, report["ContainersDeleted"])

            # SpaceReclaimed is the size of the content created during the running of the container
-            self.assertEqual(report["SpaceReclaimed"], 0)
+            # TODO: This should probably check if the podman version is >= 4.6 (guess)
+            self.assertGreater(report["SpaceReclaimed"], 0)

            with self.assertRaises(NotFound):
                self.client.containers.get(top_ctnr.id)
--- a/podman/version.py
+++ b/podman/version.py
@ -1,4 +1,4 @@
 """Version of PodmanPy."""

-__version__ = "4.5.0"
+__version__ = "4.5.1"
 __compatible_version__ = "1.40"
--- a/requirements.txt
+++ b/requirements.txt
@ -4,5 +4,5 @@ requests>=2.24
 setuptools
 sphinx
 tomli>=1.2.3; python_version<'3.11'
-urllib3>=1.26.5
+urllib3>=1.26.5,<2.0.0
 wheel
--- a/setup.cfg
+++ b/setup.cfg
@ -1,6 +1,6 @@
 [metadata]
 name = podman
-version = 4.5.0
+version = 4.5.1
 author = Brent Baude, Jhon Honce
 author_email = jhonce@redhat.com
 description = Bindings for Podman RESTful API
@ -37,7 +37,7 @@ install_requires =
    pyxdg >=0.26
    requests >=2.24
    tomli>=1.2.3; python_version<'3.11'
-    urllib3 >=1.26.5
+    urllib3 >= 1.26.5, < 2.0.0

 # typing_extensions are included for RHEL 8.5
 # typing_extensions;python_version<'3.8'
Author	SHA1	Message	Date
Urvashi Mohnani	5114564b25	Bump version to v4.5.1 Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>	2023-05-31 15:07:11 +00:00
Urvashi Mohnani	e9803cdc2a	Merge pull request #274 from umohnani8/urlib-4.5 [v4.5-rhel] cherry-pick urlib3 fixes	2023-05-31 15:02:45 +00:00
Chris Evich	ce9cd250d7	Fix SpaceReclaimed test failure There was a change in podman that causes the reclaimed size to be greater than zero. Update the test accordingly. Thanks to @jwhonce for the fix. Signed-off-by: Chris Evich <cevich@redhat.com>	2023-05-31 14:20:39 +00:00
Chris Evich	7956c30161	Revert "chore(deps): update dependency urllib3 to v2" This reverts commit `6d37fea009`. Signed-off-by: Chris Evich <cevich@redhat.com>	2023-05-31 14:04:55 +00:00