From 8ff22256fe997dfc32777b740d05abcce68709db Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 21 Jun 2023 08:30:13 -0400 Subject: [PATCH] Keep main branch version ahead of release branches Signed-off-by: Lokesh Mandvekar --- Makefile | 2 +- podman/tests/__init__.py | 2 +- podman/version.py | 2 +- rpm/python-podman.spec | 4 ++-- setup.cfg | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0af50e2c..f1cc7fcd 100644 --- a/Makefile +++ b/Makefile @@ -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.6.0" .PHONY: podman podman: diff --git a/podman/tests/__init__.py b/podman/tests/__init__.py index 70fe5ccb..5b37a059 100644 --- 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.6.0/libpod" COMPATIBLE_URL = "http://%2Frun%2Fapi.sock/v1.40" diff --git a/podman/version.py b/podman/version.py index 11df6dd5..dea6d2d7 100644 --- a/podman/version.py +++ b/podman/version.py @@ -1,4 +1,4 @@ """Version of PodmanPy.""" -__version__ = "4.5.0" +__version__ = "4.6.0" __compatible_version__ = "1.40" diff --git a/rpm/python-podman.spec b/rpm/python-podman.spec index a80cbaeb..672fa606 100644 --- a/rpm/python-podman.spec +++ b/rpm/python-podman.spec @@ -100,8 +100,8 @@ export PBR_VERSION="0.0.0" %if %{with rhel8_py} %files -n python%{python3_pkgversion}-%{pypi_name} -%dir %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/* +%dir %{python3_sitelib}/%{pypi_name}-*-py%{python3_version}.egg-info +%{python3_sitelib}/%{pypi_name}-*-py%{python3_version}.egg-info/* %dir %{python3_sitelib}/%{pypi_name} %{python3_sitelib}/%{pypi_name}/* %else diff --git a/setup.cfg b/setup.cfg index 29a92c48..5b314809 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = podman -version = 4.5.0 +version = 4.6.0 author = Brent Baude, Jhon Honce author_email = jhonce@redhat.com description = Bindings for Podman RESTful API