From d3a427bd7458e1d5ebfd9ada0fa0bb71e0e7dfc4 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Fri, 28 Jul 2023 11:36:34 +0100 Subject: [PATCH 1/4] setup.cfg: update keywords Update old keywords to new format: https://setuptools.pypa.io/en/latest/userguide/declarative_config.html#metadata --- setup.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 97318ec..a634c58 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [metadata] name = git-deps -summary = automatically detect dependencies between git commits +description = automatically detect dependencies between git commits author = Adam Spiers -author-email = git@adamspiers.org +author_email = git@adamspiers.org license = GPL-2+ -home-page = https://github.com/aspiers/git-deps -description-file = README.md +home_page = https://github.com/aspiers/git-deps +long_description = file: README.md, USAGE.md, USE-CASES.md classifier = Development Status :: 4 - Beta Environment :: Console From 8eb9cef5212e1174a30f5b8eb77ed362fdb4efb8 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Fri, 28 Jul 2023 11:40:35 +0100 Subject: [PATCH 2/4] setup.cfg: add bdist_rpm (untested) Based on example in: - https://docs.python.org/3/distutils/configfile.html --- setup.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/setup.cfg b/setup.cfg index a634c58..263edb7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -52,6 +52,18 @@ docs = build_sphinx # Use this option if your package is pure-python universal = 1 +[bdist_rpm] +release = 1 +packager = Adam Spiers +doc_files = README.md + USAGE.md + USE-CASES.md + CHANGES.rst + CONTRIBUTING.md + HISTORY.md + INSTALL.md + AUTHORS.rst + [build_sphinx] source_dir = docs build_dir = docs/_build From aa3a9d78746ad7f997e8f1a05b7e3e6514582cef Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Fri, 28 Jul 2023 11:42:06 +0100 Subject: [PATCH 3/4] tox.ini: update Python interpreters in envlist Python 3.7 and earlier are now EOL, and 3.11 is the latest. --- .travis.yml | 8 ++++++-- tox.ini | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56e4751..000944b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,14 @@ virt: lxd language: python matrix: include: - - python: 3.7 - env: TOX_ENV=py37 - python: 3.8 env: TOX_ENV=py38 + - python: 3.9 + env: TOX_ENV=py39 + - python: 3.10 + env: TOX_ENV=py39 + - python: 3.11 + env: TOX_ENV=py311 install: - pip install tox script: diff --git a/tox.ini b/tox.ini index 89f5094..f39f123 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ [tox] minversion = 1.8 -envlist = py37,py38,flake8 +envlist = py38,py39,py310,py311,flake8 skip_missing_interpreters = True [testenv] From a0a593694a56ec39632f7064b00766f50a7657c6 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Fri, 28 Jul 2023 11:46:59 +0100 Subject: [PATCH 4/4] move README markdown setup to setup.cfg This declarative approach seems somewhat cleaner. See https://dustingram.com/articles/2018/03/16/markdown-descriptions-on-pypi/ --- setup.cfg | 1 + setup.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 263edb7..a488f48 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ author_email = git@adamspiers.org license = GPL-2+ home_page = https://github.com/aspiers/git-deps long_description = file: README.md, USAGE.md, USE-CASES.md +long_description_content_type = text/markdown classifier = Development Status :: 4 - Beta Environment :: Console diff --git a/setup.py b/setup.py index 6f11ee4..c9879ac 100644 --- a/setup.py +++ b/setup.py @@ -20,8 +20,6 @@ def setup_package(): 'six', 'pyscaffold>=2.5.10,<2.6a0', ] + sphinx, - long_description='README.md', - long_description_content_type="text/markdown", use_pyscaffold=True )