From 599d84aabd738aaa4bd17bf56a9b506fa7cbe0a9 Mon Sep 17 00:00:00 2001 From: ErikKalkoken Date: Sat, 25 Jul 2026 11:25:09 +0200 Subject: [PATCH] ci: update to new standard --- .github/workflows/ci-cd.yaml | 10 ++------ CHANGELOG.md | 10 +++++++- Makefile | 50 ++++++++++++++++++++++++------------ README.md | 2 +- pyproject.toml | 4 +-- tox.ini | 2 +- 6 files changed, 49 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml index 3eaf805..670b586 100644 --- a/.github/workflows/ci-cd.yaml +++ b/.github/workflows/ci-cd.yaml @@ -1,12 +1,6 @@ name: CI/CD Pipeline -on: - push: - branches: - - "**" - tags: - - "*" - pull_request: +on: push jobs: pre-commit: @@ -82,7 +76,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} slug: AllianceAuth-Apps/aa-killtracker - deploy-pypi: + publish: needs: [test] if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f83b4a..69ce547 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,19 @@ # Change Log +> [!WARNING] +> This file has been decommissioned. Changes are now documented on the GitHub releases page. + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] - yyyy-mm-dd +## [2.0.1] - 2026-07-11 + +### Changed + +- Migrated to new home on GitHub +- Decommissioned CHANGELOG file ## [2.0.0] - 2026-05-21 diff --git a/Makefile b/Makefile index a4d106d..2a31636 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,9 @@ +# This file expects an .env file to exist that defines MANAGE_PY_PATH +# For example MANAGE_PY_PATH=/home/allianceserver/venv/myauth/manage.py + +-include .env +export + appname = aa-killtracker package = killtracker @@ -6,12 +12,19 @@ help: makemessages: cd $(package) && \ - django-admin makemessages -l en --ignore 'build/*' && \ - django-admin makemessages -l de --ignore 'build/*' && \ - django-admin makemessages -l es --ignore 'build/*' && \ - django-admin makemessages -l ko --ignore 'build/*' && \ - django-admin makemessages -l ru --ignore 'build/*' && \ - django-admin makemessages -l zh_Hans --ignore 'build/*' + django-admin makemessages \ + -l de \ + -l en \ + -l es \ + -l fr_FR \ + -l it_IT \ + -l ja \ + -l ko_KR \ + -l ru \ + -l uk \ + -l zh_Hans \ + --keep-pot \ + --ignore 'build/*' tx_push: tx push --source @@ -21,18 +34,23 @@ tx_pull: compilemessages: cd $(package) && \ - django-admin compilemessages -l en && \ - django-admin compilemessages -l de && \ - django-admin compilemessages -l es && \ - django-admin compilemessages -l ko && \ - django-admin compilemessages -l ru && \ - django-admin compilemessages -l zh_Hans + django-admin compilemessages \ + -l de \ + -l en \ + -l es \ + -l fr_FR \ + -l it_IT \ + -l ja \ + -l ko_KR \ + -l ru \ + -l uk \ + -l zh_Hans coverage: - coverage run ../myauth/manage.py test $(package).tests --keepdb --failfast && coverage html && coverage report + coverage run $(MANAGE_PY_PATH) test $(package) --keepdb --failfast && coverage html && coverage report -m -check_complexity: - flake8 $(package) --max-complexity=10 +pylint: + pylint --load-plugins pylint_django $(package) graph_models: - python ../myauth/manage.py graph_models $(package) --arrow-shape normal -o $(appname)_models.png + python $(MANAGE_PY_PATH) graph_models $(package) --arrow-shape normal -o $(appname)_models.png diff --git a/README.md b/README.md index fd471b1..e6b39fa 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ And here is how posted killmails look on Discord: 1. Killtracker is a plugin for Alliance Auth. If you don't have Alliance Auth running already, please install it first before proceeding. (see the official [AA installation guide](https://allianceauth.readthedocs.io/en/latest/installation/auth/allianceauth/) for details) -2. Killtracker needs the app [django-eveuniverse](https://gitlab.com/ErikKalkoken/django-eveuniverse) to function. Please make sure it is installed, before continuing. +2. Killtracker needs the app [django-eveuniverse](https://github.com/AllianceAuth-Apps/django-eveuniverse) to function. Please make sure it is installed, before continuing. 3. Killtracker will generate a lot of tasks. For optimal performance we recommend a threads-based configuration of your celery workers. Please see [this guide](https://aa-memberaudit.readthedocs.io/en/latest/operations.html#configuring-celery-workers) for details. diff --git a/pyproject.toml b/pyproject.toml index 286c350..23d2ae8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi" [project] name = "aa-killtracker" -authors = [{ name = "Erik Kalkoken", email = "kalkoken87@gmail.com" }] +authors = [{ name = "Erik Kalkoken", email = "erik.kalkoken@gmail.com" }] readme = "README.md" dynamic = ["version", "description"] license = { file = "LICENSE" } @@ -24,7 +24,7 @@ classifiers = [ "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ] dependencies = [ - "allianceauth-app-utils>=1.31", + "allianceauth-app-utils>=1.33.2", "allianceauth>=4,<6", "django-esi>=8,<10", "dacite", diff --git a/tox.ini b/tox.ini index 6f758fe..40ac908 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ setenv = deps = django42: allianceauth<5 - django52: allianceauth>=5.0.0b2,<6 + django52: allianceauth>=5,<6 extras = test