Merge setup.py in pyproject.toml (#5351)

* Merge setup.py into pyproject.toml and add pyproject-fmt pre-commit hook for formatting it
This commit is contained in:
Jelmer 2024-09-06 14:05:26 +02:00 committed by GitHub
parent e2a47bf83f
commit ea4cd48e6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 58 additions and 61 deletions

View File

@ -47,6 +47,11 @@ repos:
hooks:
- id: flake8
- repo: https://github.com/tox-dev/pyproject-fmt
rev: "2.0.4"
hooks:
- id: pyproject-fmt
ci:
autoupdate_schedule: weekly
skip: []

View File

@ -1,35 +1,68 @@
# ==== pytest ====
[tool.pytest.ini_options]
addopts = "-v --tb=short"
norecursedirs = [
".tox",
".git",
"*/migrations/*",
"*/static/*",
"docs",
"venv",
"*/{{cookiecutter.project_slug}}/*",
[project]
name = "cookiecutter-django"
version = "2024.09.05"
description = "A Cookiecutter template for creating production-ready Django projects quickly."
readme = "README.md"
keywords = [
"cookiecutter",
"django",
"project template",
"scaffolding",
"skeleton",
]
license = { text = "BSD" }
authors = [
{ name = "Daniel Roy Greenfeld", email = "pydanny@gmail.com" },
]
requires-python = "==3.12"
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Console",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Natural Language :: English",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Software Development",
]
urls = { Repository = "https://github.com/cookiecutter/cookiecutter-django" }
# ==== black ====
[tool.black]
line-length = 119
target-version = ['py312']
target-version = [
'py312',
]
# ==== isort ====
[tool.isort]
profile = "black"
line_length = 119
known_first_party = [
"tests",
"scripts",
"hooks",
"tests",
"scripts",
"hooks",
]
# ==== djLint ====
[tool.pytest.ini_options]
addopts = "-v --tb=short"
norecursedirs = [
".tox",
".git",
"*/migrations/*",
"*/static/*",
"docs",
"venv",
"*/{{cookiecutter.project_slug}}/*",
]
# ==== black ====
[tool.djlint]
blank_line_after_tag = "load,extends"
close_void_tags = true

View File

@ -47,7 +47,7 @@ def main() -> None:
print(f"Wrote {changelog_path}")
# Update version
setup_py_path = ROOT / "setup.py"
setup_py_path = ROOT / "pyproject.toml"
update_version(setup_py_path, release)
print(f"Updated version in {setup_py_path}")

View File

@ -1,41 +0,0 @@
#!/usr/bin/env python
try:
from setuptools import setup
except ImportError:
from distutils.core import setup
# We use calendar versioning
version = "2024.09.05"
with open("README.md") as readme_file:
long_description = readme_file.read()
setup(
name="cookiecutter-django",
version=version,
description=("A Cookiecutter template for creating production-ready " "Django projects quickly."),
long_description=long_description,
author="Daniel Roy Greenfeld",
author_email="pydanny@gmail.com",
url="https://github.com/cookiecutter/cookiecutter-django",
packages=[],
license="BSD",
zip_safe=False,
classifiers=[
"Development Status :: 4 - Beta",
"Environment :: Console",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
"Natural Language :: English",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Software Development",
],
keywords=(
"cookiecutter, Python, projects, project templates, django, "
"skeleton, scaffolding, project directory, setup.py"
),
)