Skip to content

Commit

Permalink
Merge branch 'trunk' into 384-cli-help
Browse files Browse the repository at this point in the history
  • Loading branch information
adiroiban authored Jul 20, 2022
2 parents acfcf65 + f7ab085 commit c839a36
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ name: CI

on:
push:
branches: [ master ]
branches: [ trunk ]
tags: [ "**" ]
pull_request:
branches: [ master ]

defaults:
run:
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
maintainer_email="hawkowl@twistedmatrix.com",
url="https://github.com/hawkowl/towncrier",
project_urls={
"Chat": "https://webchat.freenode.net/?channels=%23twisted",
"Maillist": "https://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python",
"Documentation": "https://towncrier.readthedocs.io/",
"Chat": "https://web.libera.chat/?channels=%23twisted",
"Mailing list": "https://mail.python.org/mailman3/lists/twisted.python.org/",
"Issues": "https://github.com/twisted/towncrier/issues",
"Repository": "https://github.com/twisted/towncrier",
"Tests": "https://github.com/twisted/towncrier/actions?query=branch%3Amaster",
Expand Down
1 change: 1 addition & 0 deletions src/towncrier/newsfragments/366.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update the project URLs for the package, to point to current resources.
Empty file.
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ commands =

[testenv:check-newsfragment]
commands =
python -m towncrier.check
python -m towncrier.check --compare-with origin/trunk

[testenv:check-manifest]
deps = check-manifest
Expand Down

0 comments on commit c839a36

Please sign in to comment.