Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate packaging to pyproject.toml #9056

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3136996
migrate setup.cfg to setup.py
deronnax Jul 27, 2023
401de87
restore a setup.py stub
deronnax Jul 27, 2023
6019f1d
migrate setup.cfg to pyproject.toml
deronnax Jul 27, 2023
121caba
tox: isolated build
deronnax Jul 28, 2023
c2062da
remove python 3.6
deronnax Jul 29, 2023
a71ed6a
get package version from rest_framework.__version__
deronnax Oct 6, 2023
0bcd152
more concise readme inclusion
deronnax Oct 6, 2023
34840fd
remove flake8 config from pyproject.toml
deronnax Oct 7, 2023
9b6e714
remove 'zip-safe' and 'exclude' arguments
deronnax Oct 7, 2023
cf25dcd
move back non-packing related config into setup.cfg
deronnax Oct 7, 2023
040ded0
remove unneeded include-package-data field
deronnax Feb 27, 2024
9ce6b62
remove 'license-files' field
deronnax Feb 27, 2024
c4bcfc4
Revert "remove python 3.6"
deronnax Feb 28, 2024
2770f5e
Merge branch 'master' into migrate_setuppy_to_pryoject.toml
deronnax Mar 20, 2024
6f8da97
Merge branch 'master' into migrate_setuppy_to_pryoject.toml
deronnax Oct 13, 2024
2ef6126
pre-commit: tomli optional additional dependency
deronnax Oct 16, 2024
c8030fc
remove final wording note from pyproject.toml
deronnax Oct 16, 2024
0101d89
remove flake8 section in pyproject
deronnax Oct 16, 2024
c1c39d4
delete setup.py
deronnax Oct 16, 2024
561bd4c
ci: remove tox 'isolated_build'
deronnax Oct 17, 2024
29205f0
restore minimalist setup.py
deronnax Oct 18, 2024
1278968
also update build/upload instruction
deronnax Nov 15, 2024
06bebc2
remove parameters for which the value is already the default
deronnax Dec 1, 2024
ea10c54
use 'rest_framework' package namespace
deronnax Dec 1, 2024
5729b02
Revert "use 'rest_framework' package namespace"
deronnax Dec 1, 2024
7770fe4
include "rest_framework*" in pyproject.toml
deronnax Dec 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ repos:
hooks:
- id: codespell
exclude: locale|kickstarter-announcement.md|coreapi-0.1.1.js
additional_dependencies:
# python doesn't come with a toml parser prior to 3.11
- "tomli; python_version < '3.11'"
8 changes: 5 additions & 3 deletions docs/community/project-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ The following template should be used for the description of the issue, and serv

- [ ] Create pull request for [release notes](https://github.com/encode/django-rest-framework/blob/master/docs/topics/release-notes.md) based on the [*.*.* milestone](https://github.com/encode/django-rest-framework/milestones/***).
- [ ] Update supported versions:
- [ ] `setup.py` `python_requires` list
- [ ] `setup.py` Python & Django version trove classifiers
- [ ] `pyproject.toml` `python_requires` list
- [ ] `pyproject.toml` Python & Django version trove classifiers
- [ ] `README` Python & Django versions
- [ ] `docs` Python & Django versions
- [ ] Update the translations from [transifex](https://www.django-rest-framework.org/topics/project-management/#translations).
Expand All @@ -72,7 +72,9 @@ The following template should be used for the description of the issue, and serv
- [ ] Confirm with @tomchristie that release is finalized and ready to go.
- [ ] Ensure that release date is included in pull request.
- [ ] Merge the release pull request.
- [ ] Push the package to PyPI with `./setup.py publish`.
- [ ] Install the release tools: `pip install build twine`
- [ ] Build the package: `python -m build`
- [ ] Push the package to PyPI with `twine upload dist/*`
- [ ] Tag the release, with `git tag -a *.*.* -m 'version *.*.*'; git push --tags`.
- [ ] Deploy the documentation with `mkdocs gh-deploy`.
- [ ] Make a release announcement on the [discussion group](https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework).
Expand Down
85 changes: 85 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
[build-system]
requires = ["setuptools>=61.2"]
build-backend = "setuptools.build_meta"

[project]
name = "djangorestframework"
readme = "README.md"
authors = [{name = "Tom Christie", email = "[email protected]"}]
license = {text = "BSD"}
description = "Web APIs for Django, made easy."
classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Django :: 5.1",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"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 :: 3 :: Only",
"Topic :: Internet :: WWW/HTTP",
]
requires-python = ">=3.8"
dependencies = [
"django>=4.2",
'backports.zoneinfo;python_version<"3.9"',
]
dynamic = ["version"]

[tool.setuptools.dynamic]
version = {attr = "rest_framework.__version__"}

[project.urls]
Homepage = "https://www.django-rest-framework.org/"
Funding = "https://fund.django-rest-framework.org/topics/funding/"
Source = "https://github.com/encode/django-rest-framework"
Changelog = "https://www.django-rest-framework.org/community/release-notes/"

[tool.setuptools]
zip-safe = false
include-package-data = true
deronnax marked this conversation as resolved.
Show resolved Hide resolved
deronnax marked this conversation as resolved.
Show resolved Hide resolved
license-files = ["LICENSE.md"]
deronnax marked this conversation as resolved.
Show resolved Hide resolved

[tool.setuptools.packages.find]
namespaces = false
Copy link
Contributor

@terencehonles terencehonles Nov 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason you're disabling namespaces? I believe you can also just specify the packages directly since there is only one:

Suggested change
[tool.setuptools.packages.find]
namespaces = false
packages = ["rest_framework"]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I disabled them because they were disabled originally, using find_packages in the setup.py instead of find_namespace_packages. I tried your suggestion but it broke the CI, so I reverted it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thanks for trying. It appears I misunderstood the default behavior for nested packages.

You'd need to try the following:

Suggested change
[tool.setuptools.packages.find]
namespaces = false
[tool.setuptools.packages.find]
include = ["rest_framework*"]

I used the build module to build a wheel and with my original suggestion it was warning that the sub-packages were not being included, but with the include statement it worked as intended and bundled the sub-packages.

Do you mind running that by the CI?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure. But as it is changing the behavior, even if it works, I would like it in a separate PR :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well what you used doesn't match the original either, since you're missing the exclude so I'd just switch to the new style using include and you can leave off the namespace disabling or turn it off if you really prefer it to be off. I just don't think it needs to be off.


[tool.pytest.ini_options]
addopts = "--tb=short --strict-markers -ra"
testpaths = ["tests"]
filterwarnings = ["ignore:CoreAPI compatibility is deprecated*:rest_framework.RemovedInDRF317Warning"]

[tool.isort]
skip = [".tox"]
atomic = true
multi_line_output = 5
extra_standard_library = ["types"]
known_third_party = ["pytest", "_pytest", "django", "pytz", "uritemplate"]
known_first_party = ["rest_framework", "tests"]

[tool.coverage.run]
# NOTE: source is ignored with pytest-cov (but uses the same).
source = ["."]
include = ["rest_framework/*", "tests/*"]
branch = true

[tool.coverage.report]
include = ["rest_framework/*", "tests/*"]
exclude_lines = [
"pragma: no cover",
"raise NotImplementedError",
]

[tool.codespell]
# Ref: https://github.com/codespell-project/codespell#using-a-config-file
skip = "*/kickstarter-announcement.md,*.js,*.map,*.po"
ignore-words-list = "fo,malcom,ser"
deronnax marked this conversation as resolved.
Show resolved Hide resolved
33 changes: 0 additions & 33 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,36 +1,3 @@
[metadata]
license_files = LICENSE.md

[tool:pytest]
addopts=--tb=short --strict-markers -ra
testpaths = tests
filterwarnings = ignore:CoreAPI compatibility is deprecated*:rest_framework.RemovedInDRF317Warning

[flake8]
ignore = E501,W503,W504
banned-modules = json = use from rest_framework.utils import json!

[isort]
skip=.tox
atomic=true
multi_line_output=5
extra_standard_library=types
known_third_party=pytest,_pytest,django,pytz,uritemplate
known_first_party=rest_framework,tests

[coverage:run]
# NOTE: source is ignored with pytest-cov (but uses the same).
source = .
include = rest_framework/*,tests/*
branch = 1

[coverage:report]
include = rest_framework/*,tests/*
exclude_lines =
pragma: no cover
raise NotImplementedError

[codespell]
# Ref: https://github.com/codespell-project/codespell#using-a-config-file
skip = */kickstarter-announcement.md,*.js,*.map,*.po
ignore-words-list = fo,malcom,ser
121 changes: 2 additions & 119 deletions setup.py
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,120 +1,3 @@
import os
import re
deronnax marked this conversation as resolved.
Show resolved Hide resolved
import shutil
import sys
from io import open
from setuptools import setup

from setuptools import find_packages, setup

CURRENT_PYTHON = sys.version_info[:2]
REQUIRED_PYTHON = (3, 8)

# This check and everything above must remain compatible with Python 2.7.
if CURRENT_PYTHON < REQUIRED_PYTHON:
sys.stderr.write("""
==========================
Unsupported Python version
==========================

This version of Django REST Framework requires Python {}.{}, but you're trying
to install it on Python {}.{}.

This may be because you are using a version of pip that doesn't
understand the python_requires classifier. Make sure you
have pip >= 9.0 and setuptools >= 24.2, then try again:

$ python -m pip install --upgrade pip setuptools
$ python -m pip install djangorestframework

This will install the latest version of Django REST Framework which works on
your version of Python. If you can't upgrade your pip (or Python), request
an older version of Django REST Framework:

$ python -m pip install "djangorestframework<3.10"
""".format(*(REQUIRED_PYTHON + CURRENT_PYTHON)))
sys.exit(1)


def read(f):
with open(f, 'r', encoding='utf-8') as file:
return file.read()


def get_version(package):
"""
Return package version as listed in `__version__` in `init.py`.
"""
init_py = open(os.path.join(package, '__init__.py')).read()
return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)


version = get_version('rest_framework')


if sys.argv[-1] == 'publish':
if os.system("pip freeze | grep twine"):
print("twine not installed.\nUse `pip install twine`.\nExiting.")
sys.exit()
os.system("python setup.py sdist bdist_wheel")
if os.system("twine check dist/*"):
print("twine check failed. Packages might be outdated.")
print("Try using `pip install -U twine wheel`.\nExiting.")
sys.exit()
os.system("twine upload dist/*")
print("You probably want to also tag the version now:")
print(" git tag -a %s -m 'version %s'" % (version, version))
print(" git push --tags")
shutil.rmtree('dist')
shutil.rmtree('build')
shutil.rmtree('djangorestframework.egg-info')
sys.exit()

deronnax marked this conversation as resolved.
Show resolved Hide resolved

setup(
name='djangorestframework',
version=version,
url='https://www.django-rest-framework.org/',
license='BSD',
description='Web APIs for Django, made easy.',
long_description=read('README.md'),
long_description_content_type='text/markdown',
author='Tom Christie',
author_email='[email protected]', # SEE NOTE BELOW (*)
packages=find_packages(exclude=['tests*']),
include_package_data=True,
install_requires=["django>=4.2", 'backports.zoneinfo;python_version<"3.9"'],
python_requires=">=3.8",
zip_safe=False,
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'Framework :: Django :: 5.1',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'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 :: 3 :: Only',
'Topic :: Internet :: WWW/HTTP',
],
project_urls={
'Funding': 'https://fund.django-rest-framework.org/topics/funding/',
'Source': 'https://github.com/encode/django-rest-framework',
'Changelog': 'https://www.django-rest-framework.org/community/release-notes/',
},
)

# (*) Please direct queries to the discussion group, rather than to me directly
# Doing so helps ensure your question is helpful to other users.
# Queries directly to my email are likely to receive a canned response.
#
# Many thanks for your understanding.
setup()
Loading