Skip to content

Commit

Permalink
Keep main branch version ahead of release branches
Browse files Browse the repository at this point in the history
Signed-off-by: Lokesh Mandvekar <[email protected]>
  • Loading branch information
lsm5 committed Jun 21, 2023
1 parent efe4995 commit 8ff2225
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion podman/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion podman/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Version of PodmanPy."""

__version__ = "4.5.0"
__version__ = "4.6.0"
__compatible_version__ = "1.40"
4 changes: 2 additions & 2 deletions rpm/python-podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = podman
version = 4.5.0
version = 4.6.0
author = Brent Baude, Jhon Honce
author_email = [email protected]
description = Bindings for Podman RESTful API
Expand Down

0 comments on commit 8ff2225

Please sign in to comment.