From 871807080250220c810dab0a3244b342a7a3c6d7 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Sun, 5 Jan 2025 14:13:49 -0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=93=A6=20Migrate=20from=20`pbr`=20to?= =?UTF-8?q?=20`setuptools-scm`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch additionally enables support for `git archive`s [[1]]. [1]: https://setuptools-scm.readthedocs.io/en/latest/usage/#git-archives Co-Authored-By: Sviatoslav Sydorenko --- .git_archival.txt | 3 +++ .gitattributes | 1 + pyproject.toml | 6 ++++-- setup.cfg | 10 ++++------ 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .git_archival.txt create mode 100644 .gitattributes diff --git a/.git_archival.txt b/.git_archival.txt new file mode 100644 index 0000000..7c51009 --- /dev/null +++ b/.git_archival.txt @@ -0,0 +1,3 @@ +node: $Format:%H$ +node-date: $Format:%cI$ +describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a7b00 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.git_archival.txt export-subst diff --git a/pyproject.toml b/pyproject.toml index 1f4f627..bb1f8e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,8 @@ [build-system] requires = [ - "pbr >= 6", "setuptools >= 64", + "setuptools_scm >= 8", ] -build-backend = "pbr.build" +build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] diff --git a/setup.cfg b/setup.cfg index c83b61c..07d0271 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,12 +2,11 @@ name = requests-unixsocket author = Marc Abramowitz author_email = marc@marc-abramowitz.com -summary = Use requests to talk HTTP via a UNIX domain socket -description_file = README.rst +description = Use requests to talk HTTP via a UNIX domain socket +long_description = file: README.rst license = Apache-2 -home_page = https://github.com/msabramo/requests-unixsocket -# home_page = https://requests-unixsocket.readthedocs.org/ -classifier = +url = https://github.com/msabramo/requests-unixsocket +classifiers = Development Status :: 3 - Alpha Intended Audience :: Developers Intended Audience :: Information Technology @@ -20,7 +19,6 @@ classifier = Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 Programming Language :: Python :: 3.13 -test_suite = requests_unixsocket.tests python_requires = >= 3.9 [files] From 1ffca8eb06e64edd244bf86a94dc93de744c9eb1 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Sun, 5 Jan 2025 14:13:49 -0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=A6=20Migrate=20metadata=20declara?= =?UTF-8?q?tion=20to=20PEP=20621?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Sviatoslav Sydorenko --- pyproject.toml | 43 +++++++++++++++++++++++++++++++++++++++++++ setup.cfg | 28 ---------------------------- setup.py | 9 --------- 3 files changed, 43 insertions(+), 37 deletions(-) delete mode 100644 setup.cfg delete mode 100755 setup.py diff --git a/pyproject.toml b/pyproject.toml index bb1f8e7..6183187 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,4 +5,47 @@ requires = [ ] build-backend = "setuptools.build_meta" +[project] +name = "requests-unixsocket" +description = "Use requests to talk HTTP via a UNIX domain socket" +requires-python = ">= 3.9" +dependencies = [ + "requests >= 1.1", +] +classifiers = [ + "Development Status :: 3 - Alpha", + + "Intended Audience :: Developers", + "Intended Audience :: Information Technology", + + "Operating System :: OS Independent", + + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: Implementation", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: Jython", + "Programming Language :: Python :: Implementation :: PyPy", +] +dynamic = [ + "version", +] + +[[project.authors]] +name = "Marc Abramowitz" +email = "marc@marc-abramowitz.com" + +[project.readme] +file = "README.rst" +content-type = "text/x-rst" + +[project.urls] +Homepage = "https://github.com/msabramo/requests-unixsocket" + [tool.setuptools_scm] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 07d0271..0000000 --- a/setup.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[metadata] -name = requests-unixsocket -author = Marc Abramowitz -author_email = marc@marc-abramowitz.com -description = Use requests to talk HTTP via a UNIX domain socket -long_description = file: README.rst -license = Apache-2 -url = https://github.com/msabramo/requests-unixsocket -classifiers = - Development Status :: 3 - Alpha - Intended Audience :: Developers - Intended Audience :: Information Technology - License :: OSI Approved :: Apache Software License - Operating System :: OS Independent - Programming Language :: Python - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 - Programming Language :: Python :: 3.13 -python_requires = >= 3.9 - -[files] -packages = requests_unixsocket - -[wheel] -universal = 1 diff --git a/setup.py b/setup.py deleted file mode 100755 index e7f27b2..0000000 --- a/setup.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python - -from setuptools import setup - -setup( - setup_requires=['pbr'], - install_requires=['requests>=1.1'], - pbr=True, -)