diff --git a/Makefile b/Makefile index 110f0b95..ddb4193f 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ HEAD ?= HEAD export PODMAN_VERSION ?= "3.2.0" -.PHONY: podman-py -podman-py: +.PHONY: podman +podman: rm dist/* || : python -m pip install --user -r requirements.txt PODMAN_VERSION=$(PODMAN_VERSION) \ @@ -38,15 +38,17 @@ integration: coverage run -m unittest discover -s podman/tests/integration coverage report -m --skip-covered --fail-under=80 --omit=./podman/tests/* --omit=.tox/* --omit=/usr/lib/* -.PHONY: upload -upload: - twine upload --verbose -r testpypi dist/*whl dist/*zip - # pip install -i https://test.pypi.org/simple/ podman-py +.PHONY: test-release +test-release: SOURCE = $(shell find dist -regex '.*/podman-[0-9][0-9\.]*.tar.gz' -print) +test-release: + twine upload --verbose -r testpypi dist/*whl $(SOURCE) + # pip install -i https://test.pypi.org/simple/ podman .PHONY: release +release: SOURCE = $(shell find dist -regex '.*/podman-[0-9][0-9\.]*.tar.gz' -print) release: - twine upload --verbose dist/*whl dist/*zip - # pip install podman-py + twine upload --verbose dist/*whl $(SOURCE) + # pip install podman .PHONY: docs docs: diff --git a/README.md b/README.md index b49803c9..4bb67e6b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # podman-py [![Build Status](https://api.cirrus-ci.com/github/containers/podman-py.svg)](https://cirrus-ci.com/github/containers/podman-py/main) -[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/23171) This python package is a library of bindings to use the RESTful API of [Podman](https://github.com/containers/podman). It is currently under development and contributors are welcome! diff --git a/docs/source/conf.py b/docs/source/conf.py index 5a6a9ddc..d0c03491 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -25,7 +25,7 @@ author = u'Red Hat Inc' # The full version, including alpha/beta/rc tags -version = '3.1.2.4' +version = '3.1.2.5' release = version add_module_names = False diff --git a/docs/source/index.rst b/docs/source/index.rst index 6462a41a..3fdbc6a8 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,13 +1,13 @@ -PodmanPy: Python scripting for Podman services +Podman: Python scripting for Podman services ============================================== -.. image:: https://img.shields.io/pypi/l/podman-py.svg - :target: https://pypi.org/project/podman-py/ +.. image:: https://img.shields.io/pypi/l/podman.svg + :target: https://pypi.org/project/podman/ -.. image:: https://img.shields.io/pypi/wheel/podman-py.svg - :target: https://pypi.org/project/podman-py/ +.. image:: https://img.shields.io/pypi/wheel/podman.svg + :target: https://pypi.org/project/podman/ -.. image:: https://img.shields.io/pypi/pyversions/podman-py.svg - :target: https://pypi.org/project/podman-py/ +.. image:: https://img.shields.io/pypi/pyversions/podman.svg + :target: https://pypi.org/project/podman/ PodmanPy is a Python3 module that allows you to write Python scripts that access resources maintained by a Podman service. It leverages the Podman service RESTful API. diff --git a/podman/__init__.py b/podman/__init__.py index c631c35b..185e0afa 100644 --- a/podman/__init__.py +++ b/podman/__init__.py @@ -8,7 +8,7 @@ def __init__(self): raise NotImplementedError("ApiConnection deprecated, please use PodmanClient().") -from podman.api.version import __version__ +from podman.version import __version__ from podman.client import PodmanClient, from_env # isort: unique-list diff --git a/podman/api/__init__.py b/podman/api/__init__.py index 4a25facd..4ccd5c50 100644 --- a/podman/api/__init__.py +++ b/podman/api/__init__.py @@ -14,7 +14,7 @@ ) from podman.api.tar_utils import create_tar, prepare_containerfile, prepare_containerignore -from . import version +from .. import version DEFAULT_CHUNK_SIZE = 2 * 1024 * 1024 diff --git a/podman/api/client.py b/podman/api/client.py index 331ea08a..5f9d9528 100644 --- a/podman/api/client.py +++ b/podman/api/client.py @@ -8,7 +8,7 @@ from podman import api from podman.api.ssh import SSHAdapter -from podman.api.version import __version__ +from podman.version import __version__ from podman.api.uds import UDSAdapter from podman.errors import APIError, NotFound from podman.tlsconfig import TLSConfig diff --git a/podman/api/version.py b/podman/version.py similarity index 71% rename from podman/api/version.py rename to podman/version.py index e0d643a2..9ed97182 100644 --- a/podman/api/version.py +++ b/podman/version.py @@ -1,4 +1,4 @@ """Version of PodmanPy.""" -__version__ = "3.1.2.4" +__version__ = "3.1.2.5" __compatible_version__ = "1.40" diff --git a/pyproject.toml b/pyproject.toml index 0c7306c1..134204bd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,11 +17,7 @@ profile = "black" line_length = 100 [build-system] requires = [ - "requests>=2.24", - "toml>=0.10.2", - "urllib3>=1.24.2", - "pyxdg>=0.26", - "setuptools>=42", + "setuptools>=46.4", "wheel", ] build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index bca77166..f15cbe3c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = podman-py +name = podman version = attr: podman.__version__ author = Brent Baude, Jhon Honce author_email = jhonce@redhat.com