Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
jieter committed Jan 28, 2025
2 parents aaf18b7 + 5f95b7b commit 93d66d9
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
python-version: [3.9, "3.10", 3.11, 3.12] # 3.13 can be supported if lxml supports 3.13
django-version: [4.2, 5.0, 5.1, master]
django-version: [4.2, 5.0, 5.1, "5.2a1", "master"]
exclude:
# Django 4.2
- python-version: 3.12
Expand All @@ -34,8 +34,16 @@ jobs:
- python-version: 3.9
django-version: 5.1

# master
# Django 5.2
- python-version: 3.9
django-version: 5.2a1

# Django master
- python-version: 3.9
django-version: master
- python-version: 3.10
django-version: master
- python-version: 3.11
django-version: master

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Change log

## 2.7.5 (2025-01-02)
- Update django.po for Ukrainian 🇺🇦 ([#934](https://github.com/jieter/django-tables2/pull/934)) by [@DmytroLitvinov](https://github.com/DmytroLitvinov)

## 2.7.4 & 2.7.3 (2024-12-23)
Correct packaging mistakes:
- Remove upper bound for `python_requires`
Expand Down
2 changes: 1 addition & 1 deletion django_tables2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from .utils import A
from .views import MultiTableMixin, SingleTableMixin, SingleTableView

__version__ = "2.7.4"
__version__ = "2.7.5"

__all__ = (
"Table",
Expand Down
4 changes: 2 additions & 2 deletions django_tables2/locale/uk/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ msgstr ""
#: templates/django_tables2/bootstrap4.html:64
#: templates/django_tables2/table.html:61
msgid "previous"
msgstr "πопередня"
msgstr "попередня"

#: templates/django_tables2/bootstrap.html:89
#: templates/django_tables2/bootstrap4.html:82
#: templates/django_tables2/table.html:82
msgid "next"
msgstr "hаступна"
msgstr "наступна"
4 changes: 4 additions & 0 deletions maintenance.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
if sys.argv[-1] == "bump":
os.system("hatch version patch")

print("\n- Commit CHANGELOG and django_tables2/__init__.py")
print("- Run `./maintenance.py tag` to tag the new version")

elif sys.argv[-1] == "publish":
os.system("hatch publish")
os.system("rm -f dist/django_tables2-2.7.4*")
Expand All @@ -26,6 +29,7 @@
print(f"Failed tagging with command: {tag_cmd}")
else:
os.system("git push --tags && git push origin master")
print("\nTag created, run `./maintenance.py publish` to publish it")

elif sys.argv[-1] == "screenshots":

Expand Down

0 comments on commit 93d66d9

Please sign in to comment.