Skip to content

Commit c839a36

Browse files
authored
Merge branch 'trunk' into 384-cli-help
2 parents acfcf65 + f7ab085 commit c839a36

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ trunk ]
66
tags: [ "**" ]
77
pull_request:
8-
branches: [ master ]
98

109
defaults:
1110
run:

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
maintainer_email="[email protected]",
1515
url="https://github.com/hawkowl/towncrier",
1616
project_urls={
17-
"Chat": "https://webchat.freenode.net/?channels=%23twisted",
18-
"Maillist": "https://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python",
17+
"Documentation": "https://towncrier.readthedocs.io/",
18+
"Chat": "https://web.libera.chat/?channels=%23twisted",
19+
"Mailing list": "https://mail.python.org/mailman3/lists/twisted.python.org/",
1920
"Issues": "https://github.com/twisted/towncrier/issues",
2021
"Repository": "https://github.com/twisted/towncrier",
2122
"Tests": "https://github.com/twisted/towncrier/actions?query=branch%3Amaster",
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update the project URLs for the package, to point to current resources.

src/towncrier/newsfragments/399.misc.rst

Whitespace-only changes.

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ commands =
1111

1212
[testenv:check-newsfragment]
1313
commands =
14-
python -m towncrier.check
14+
python -m towncrier.check --compare-with origin/trunk
1515

1616
[testenv:check-manifest]
1717
deps = check-manifest

0 commit comments

Comments
 (0)