Skip to content

Commit 1968d37

Browse files
daneahdaneah
committed
Move to modern package configuration
1 parent 72f3df4 commit 1968d37

File tree

6 files changed

+240
-101
lines changed

6 files changed

+240
-101
lines changed

‎pyproject.toml‎

Lines changed: 232 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,234 @@
1+
[project]
2+
name = "django-webmention"
3+
version = "3.0.0"
4+
description = "A pluggable implementation of webmention for Django projects"
5+
authors = [
6+
{ name = "Dane Hillard", email = "[email protected]" },
7+
]
8+
license = { file = "LICENSE" }
9+
classifiers = [
10+
"Development Status :: 5 - Production/Stable",
11+
"Intended Audience :: Developers",
12+
"Framework :: Django",
13+
"Framework :: Django :: 3.2",
14+
"Framework :: Django :: 4.0",
15+
"Framework :: Django :: 4.1",
16+
"Topic :: Internet :: WWW/HTTP :: Indexing/Search",
17+
"License :: OSI Approved :: MIT License",
18+
"Programming Language :: Python",
19+
"Programming Language :: Python :: 3 :: Only",
20+
"Programming Language :: Python :: 3",
21+
"Programming Language :: Python :: 3.9",
22+
"Programming Language :: Python :: 3.10",
23+
"Programming Language :: Python :: 3.11",
24+
"Programming Language :: Python :: 3.12",
25+
"Programming Language :: Python :: 3.13",
26+
]
27+
dependencies = [
28+
"Django>=4.2.0",
29+
"requests>=2.32.3",
30+
]
31+
32+
[project.urls]
33+
Repository = "https://github.com/easy-as-python/django-webmention"
34+
35+
[tool.setuptools.packages.find]
36+
where = ["src"]
37+
exclude = ["test*"]
38+
39+
######################
40+
# Tool configuration #
41+
######################
42+
143
[tool.black]
244
line-length = 120
3-
target-version = ['py35', 'py36', 'py37', 'py38']
45+
target-version = ["py39", "py310", "py311", "py312", "py313"]
46+
47+
[tool.mypy]
48+
python_version = "3.9"
49+
warn_unused_configs = true
50+
show_error_context = true
51+
pretty = true
52+
namespace_packages = true
53+
check_untyped_defs = true
54+
55+
[[tool.mypy.overrides]]
56+
module = [
57+
"django.core.urlresolvers",
58+
]
59+
ignore_missing_imports = true
60+
61+
[tool.coverage.run]
62+
branch = true
63+
omit = [
64+
"manage.py",
65+
"webmention/checks.py",
66+
"*test*",
67+
"*/migrations/*",
68+
"*/admin.py",
69+
"*/__init__.py",
70+
]
71+
72+
[tool.coverage.report]
73+
precision = 2
74+
show_missing = true
75+
skip_covered = true
76+
77+
[tool.coverage.paths]
78+
source = [
79+
"src/webmention",
80+
"*/site-packages/webmention",
81+
]
82+
83+
[tool.pytest.ini_options]
84+
DJANGO_SETTINGS_MODULE = "tests.settings"
85+
testpaths = ["tests"]
86+
addopts = ["-ra", "-q", "--cov=webmention"]
87+
xfail_strict = true
88+
89+
[tool.tox]
90+
envlist = [
91+
"py39-django4.2",
92+
"py39-django5.0",
93+
"py39-django5.1",
94+
"py310-django4.2",
95+
"py310-django5.0",
96+
"py310-django5.1",
97+
"py311-django4.2",
98+
"py311-django5.0",
99+
"py311-django5.1",
100+
"py312-django4.2",
101+
"py312-django5.0",
102+
"py312-django5.1",
103+
"py313-django4.2",
104+
"py313-django5.0",
105+
"py313-django5.1",
106+
]
107+
108+
[tool.tox.env_run_base]
109+
deps = [
110+
"pytest",
111+
"pytest-cov",
112+
"pytest-django",
113+
]
114+
commands = [
115+
["pytest", { replace = "posargs", default = [], extend = true }],
116+
]
117+
118+
[tool.tox.env."py39-django4.2"]
119+
deps = [
120+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
121+
"Django>=4.2,<4.3",
122+
]
123+
124+
[tool.tox.env."py39-django5.0"]
125+
deps = [
126+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
127+
"Django>=5.0,<5.1",
128+
]
129+
130+
[tool.tox.env."py39-django5.1"]
131+
deps = [
132+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
133+
"Django>=5.1,<5.2",
134+
]
135+
136+
[tool.tox.env."py310-django4.2"]
137+
deps = [
138+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
139+
"Django>=4.2,<4.3",
140+
]
141+
142+
[tool.tox.env."py310-django5.0"]
143+
deps = [
144+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
145+
"Django>=5.0,<5.1",
146+
]
147+
148+
[tool.tox.env."py310-django5.1"]
149+
deps = [
150+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
151+
"Django>=5.1,<5.2",
152+
]
153+
154+
[tool.tox.env."py311-django4.2"]
155+
deps = [
156+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
157+
"Django>=4.2,<4.3",
158+
]
159+
160+
[tool.tox.env."py311-django5.0"]
161+
deps = [
162+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
163+
"Django>=5.0,<5.1",
164+
]
165+
166+
[tool.tox.env."py311-django5.1"]
167+
deps = [
168+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
169+
"Django>=5.1,<5.2",
170+
]
171+
172+
[tool.tox.env."py312-django4.2"]
173+
deps = [
174+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
175+
"Django>=4.2,<4.3",
176+
]
177+
178+
[tool.tox.env."py312-django5.0"]
179+
deps = [
180+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
181+
"Django>=5.0,<5.1",
182+
]
183+
184+
[tool.tox.env."py312-django5.1"]
185+
deps = [
186+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
187+
"Django>=5.1,<5.2",
188+
]
189+
190+
[tool.tox.env."py313-django4.2"]
191+
deps = [
192+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
193+
"Django>=4.2,<4.3",
194+
]
195+
196+
[tool.tox.env."py313-django5.0"]
197+
deps = [
198+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
199+
"Django>=5.0,<5.1",
200+
]
201+
202+
[tool.tox.env."py313-django5.1"]
203+
deps = [
204+
{ replace = "ref", of = ["tool", "tox", "env_run_base", "deps"], extend = true },
205+
"Django>=5.1,<5.2",
206+
]
207+
208+
[tool.tox.env.lint]
209+
skip_install = true
210+
deps = [
211+
"ruff",
212+
]
213+
commands = [
214+
["ruff", "check", { replace = "posargs", default = ["--diff", "src/webmention", "tests"], extend = true }],
215+
]
216+
217+
[tool.tox.env.format]
218+
skip_install = true
219+
deps = [
220+
"black",
221+
]
222+
commands = [
223+
["black", { replace = "posargs", default = ["--check", "--diff", "src/webmention", "tests"], extend = true }],
224+
]
225+
226+
[tool.tox.env.typecheck]
227+
deps = [
228+
"mypy",
229+
"django-types",
230+
"types-requests",
231+
]
232+
commands = [
233+
["mypy", { replace = "posargs", default = ["src/webmention", "tests"], extend = true }],
234+
]

‎setup.cfg‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎setup.py‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/webmention/models.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
from django.contrib.admin import display
12
from django.db import models
23
from django.utils.html import format_html
34

45

56
class WebMentionResponse(models.Model):
7+
id: int
68
response_body = models.TextField()
79
response_to = models.URLField()
810
source = models.URLField()
@@ -18,15 +20,13 @@ class Meta:
1820
def __str__(self):
1921
return self.source
2022

23+
@display(description="source")
2124
def source_for_admin(self):
22-
return format_html('<a href="{href}">{href}</a>'.format(href=self.source))
23-
24-
source_for_admin.short_description = "source"
25+
return format_html('<a href="{}">{}</a>', self.source, self.source)
2526

27+
@display(description="response to")
2628
def response_to_for_admin(self):
27-
return format_html('<a href="{href}">{href}</a>'.format(href=self.response_to))
28-
29-
response_to_for_admin.short_description = "response to"
29+
return format_html('<a href="{}">{}</a>', self.response_to, self.response_to)
3030

3131
def invalidate(self):
3232
if self.id:

‎src/webmention/views.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ def receive(request):
2727
webmention.update(source, target, response_body)
2828
return HttpResponse("The webmention was successfully received", status=202)
2929
except (SourceFetchError, TargetNotFoundError) as e:
30-
webmention.invalidate()
30+
if webmention:
31+
webmention.invalidate()
3132
return HttpResponseBadRequest(str(e))
3233
except Exception as e:
3334
return HttpResponseServerError(str(e))

‎tests/test_settings.py‎ renamed to ‎tests/settings.py‎

File renamed without changes.

0 commit comments

Comments
 (0)