Skip to content

Commit daf1eb6

Browse files
[PATCH] Minor tweak for PEP-639 support (- WIP #335 -)
Changes in file Makefile: * related work Changes in file setup.cfg: * refactored for PEP-639 * related work Changes in file setup.py: * refactored for PEP-639 * related work
1 parent d49feb4 commit daf1eb6

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,15 @@ MANIFEST.in: init
179179
$(QUIET)$(ECHO) "global-exclude .git" >>"$@" ;
180180
$(QUIET)$(ECHO) "global-exclude codecov_env" >>"$@" ;
181181
$(QUIET)$(ECHO) "global-exclude .DS_Store" >>"$@" ;
182+
$(QUIET)$(ECHO) "global-exclude .local_pip_cleanup.txt" >>"$@" ;
182183
$(QUIET)$(ECHO) "prune .gitattributes" >>"$@" ;
183184
$(QUIET)$(ECHO) "prune test-reports" >>"$@" ;
184185
$(QUIET)$(ECHO) "prune .github" >>"$@" ;
185186
$(QUIET)$(ECHO) "prune .circleci" >>"$@" ;
186187
$(QUIET)$(ECHO) "prune venv" >>"$@" ;
187188

188189
build: init ./setup.py MANIFEST.in
189-
$(QUIET)$(PYTHON) -W ignore -m build --sdist --wheel --no-isolation ./ || $(QUIET)$(PYTHON) -W ignore -m build ./ ;
190+
$(QUIET)$(PYTHON) -W ignore -m build --installer=pip ./ || $(QUIET)$(PYTHON) -W ignore -m build --sdist --wheel --no-isolation ./ || $(QUIET)$(PYTHON) -W ignore -m build ./ ;
190191
$(QUIET)$(WAIT)
191192
$(QUIET)$(ECHO) "build DONE."
192193

@@ -195,8 +196,8 @@ init:
195196
$(QUIET)$(PYTHON) -m pip install $(PIP_COMMON_FLAGS) $(PIP_ENV_FLAGS) -r requirements.txt 2>$(ERROR_LOG_PATH) || :
196197
$(QUIET)$(ECHO) "$@: Done."
197198

198-
install: init build must_be_root
199-
$(QUIET)$(PYTHON) -m pip install $(PIP_COMMON_FLAGS) $(PIP_ENV_FLAGS) -e "git+https://github.com/reactive-firewall/multicast.git#egg=multicast"
199+
install: init build
200+
$(QUIET)$(PYTHON) -m pip install $(PIP_COMMON_FLAGS) $(PIP_ENV_FLAGS) dist/multicast-*-py3-*.whl
200201
$(QUIET)$(WAIT)
201202
$(QUIET)$(ECHO) "$@: Done."
202203

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ long_description = file:README.md
88
long_description_content_type = text/markdown
99
url = https://github.com/reactive-firewall/multicast
1010
download_url = https://github.com/reactive-firewall/multicast.git
11+
license_expression = MIT
1112
classifiers =
1213
Intended Audience :: Developers
1314
Operating System :: POSIX
1415
Operating System :: MacOS :: MacOS X
1516
Operating System :: POSIX :: Linux
16-
License :: OSI Approved :: MIT License
1717
Programming Language :: Python :: 3
1818
Programming Language :: Python :: 3.13
1919
Programming Language :: Python :: 3.12
@@ -29,7 +29,7 @@ license_files =
2929
platform = any
3030
project_urls =
3131
"Bug Tracker" = https://github.com/reactive-firewall/multicast/issues
32-
License = https://github.com/reactive-firewall/multicast/LICENSE.md
32+
License = https://raw.githubusercontent.com/reactive-firewall/multicast/HEAD/LICENSE.md
3333
Documentation = https://reactive-firewallmulticast.readthedocs.io/en/stable
3434
Repository = https://github.com/reactive-firewall/multicast.git
3535

@@ -43,7 +43,7 @@ universal=0
4343
zip_safe = false
4444
py_modules = multicast
4545
test_suite = tests
46-
python_requires = >=3.9.20, !=3.14.*
46+
python_requires = >=3.9.6, !=3.9.7, !=3.9.8, !=3.9.8, !=3.9.10, !=3.9.11, !=3.9.12, !=3.9.13, !=3.9.14, !=3.9.15, !=3.9.16, !=3.9.17, !=3.9.18, !=3.9.19, !=3.14.*
4747
setup_requires =
4848
setuptools>=75.0.0
4949
wheel>=0.44.0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def parse_requirements_for_install_requires(requirements_text):
143143
str("""Operating System :: POSIX"""),
144144
str("""Operating System :: MacOS :: MacOS X"""),
145145
str("""Operating System :: POSIX :: Linux"""),
146-
str("""License :: OSI Approved :: MIT License"""),
146+
# PEP-639 removed str("""License :: OSI Approved :: MIT License"""),
147147
str("""Programming Language :: Python :: 3"""),
148148
str("""Programming Language :: Python :: 3 :: Only"""),
149149
str("""Programming Language :: Python :: 3.13"""),

0 commit comments

Comments
 (0)