Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .make/conf.d/development.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# Install the app as an editable package in the current Python environment
PHONY: dev-install
dev-install: check-python-venv
@echo "Installing $(appname) as editable package …"
@echo "Installing $(appname) as editable package…"
@pip install --ignore-requires-python -e .

# Uninstall the app from the current Python environment
PHONY: dev-uninstall
dev-uninstall: check-python-venv
@echo "Uninstalling $(appname) …"
@echo "Uninstalling $(appname)…"
@pip uninstall -y $(appname)

.PHONY: help
Expand Down
2 changes: 1 addition & 1 deletion .make/conf.d/django-esi.mk
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ get-compatibility-dates:
# Generate ESI stubs using the selected compatibility date
.PHONY: generate-esi-stubs
generate-esi-stubs: check-python-venv get-compatibility-dates check-myauth-path
@echo "Generating ESI stubs …"
@echo "Generating ESI stubs…"
@echo ""
@esi_date=$$(cat .esi-compatibility-date 2>/dev/null || exit 0); \
python $(myauth_path)/manage.py generate_esi_stubs --compatibility_date="$$esi_date"
Expand Down
2 changes: 1 addition & 1 deletion .make/conf.d/django.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ django_locales = \
# Create or update translation template (.pot file)
.PHONY: pot
pot: check-python-venv
@echo "Creating or updating .pot file …"
@echo "Creating or updating .pot file…"
@django-admin makemessages \
--locale en \
--keep-pot \
Expand Down
8 changes: 4 additions & 4 deletions .make/conf.d/git.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
# Clean untracked files and directories
.PHONY: git-clean-untracked
git-clean-untracked:
@echo "Cleaning untracked files and directories "
@echo "Cleaning untracked files and directories…"
@git clean -fd

# Optimize the repository with garbage collection
.PHONY: git-garbage-collection
git-garbage-collection:
@echo "Optimizing the repository with garbage collection "
@echo "Optimizing the repository with garbage collection…"
@git gc --prune=now --aggressive

# Prune unreachable objects
.PHONY: git-prune
git-prune:
@echo "Pruning unreachable objects "
@echo "Pruning unreachable objects…"
@git prune

# Run all git housekeeping commands
.PHONY: git-housekeeping
git-housekeeping: git-clean-untracked git-prune git-garbage-collection
@echo "Git housekeeping done "
@echo "Git housekeeping done…"

.PHONY: help
help::
Expand Down
8 changes: 4 additions & 4 deletions .make/conf.d/pre-commit.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
# Run pre-commit checks
.PHONY: pre-commit-checks
pre-commit-checks: pre-commit-install
@echo "Running pre-commit checks …"
@echo "Running pre-commit checks…"
@pre-commit run --all-files

# Update pre-commit configuration
.PHONY: pre-commit-update
pre-commit-update:
@echo "Updating pre-commit configuration …"
@echo "Updating pre-commit configuration…"
@pre-commit autoupdate --freeze

# Install pre-commit hook
.PHONY: pre-commit-install
pre-commit-install:
@echo "Installing pre-commit hook …"
@echo "Installing pre-commit hook…"
@pre-commit install

# Uninstall pre-commit hook
.PHONY: pre-commit-uninstall
pre-commit-uninstall:
@echo "Uninstalling pre-commit hook …"
@echo "Uninstalling pre-commit hook…"
@pre-commit uninstall

# Help message for the Pre-Commit commands
Expand Down
4 changes: 2 additions & 2 deletions .make/conf.d/redis.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ resdis_cli := $(shell which redis-cli)
# Flush all Redis keys
.PHONY: redis-flushall
redis-flushall:
@echo "Flushing all Redis keys …"
@echo "Flushing all Redis keys…"
@$(resdis_cli) FLUSHALL

# Check Redis status
.PHONY: redis-status
redis-status:
@echo "Checking Redis status …"
@echo "Checking Redis status…"
@$(resdis_cli) ping

.PHONY: help
Expand Down
6 changes: 3 additions & 3 deletions .make/conf.d/tests.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Coverage
.PHONY: coverage
coverage: check-python-venv check-myauth-path
@echo "Running tests and creating a coverage report …"
@echo "Running tests and creating a coverage report…"
@coverage run $(myauth_path)/manage.py \
test \
$(package) \
Expand All @@ -16,13 +16,13 @@ coverage: check-python-venv check-myauth-path
# Build test
.PHONY: build-test
build-test: check-python-venv
@echo "Building the package …"
@echo "Building the package…"
@python3 -m build

# Tox tests
.PHONY: tox-tests
tox-tests: check-python-venv
@echo "Running tests with tox …"
@echo "Running tests with tox…"
@export USE_MYSQL=False; \
tox -v -e allianceauth-latest; \

Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Section Order:

### Fixed

- Grammar - No space before ellipsis
- Class `Iterable` does not define `__sub__`, so the `-` operator cannot be used on
its instances

Expand Down Expand Up @@ -90,7 +91,7 @@ Section Order:

### Removed

- Actually remove the dependency to `eveuniverse`
- Actually remove the dependency to `eveuniverse`…

## [4.0.0] - 2026-02-27

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ confirm:
# Graph models
.PHONY: graph-models
graph-models: check-python-venv check-myauth-path
@echo "Creating a graph of the models …"
@echo "Creating a graph of the models…"
@python $(myauth_path)/manage.py \
graph_models \
$(package) \
Expand All @@ -71,7 +71,7 @@ graph-models: check-python-venv check-myauth-path
# Update the graph of the models, translation files and the version in the package
.PHONY: prepare-release
prepare-release: pot graph-models
@echo "Preparing a release …"
@echo "Preparing a release…"
@read -p "New Version Number: " new_version; \
if ! grep -qE "^## \[$$new_version\]" CHANGELOG.md; then \
previos_version=$$(grep -m 1 -E '^## \[[0-9]+(\.[0-9]+){0,2}\] - ' CHANGELOG.md | sed -E 's/^## \[([0-9]+(\.[0-9]+){0,2})\].*$$/\1/'); \
Expand Down
2 changes: 1 addition & 1 deletion sovtimer/static/sovtimer/js/aa-sov-timer.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ $(document).ready(() => {

_filters.forEach(([selector, predicate]) => _filterCampaigns(selector, predicate));

// On DataTable draw, run
// On DataTable draw, run…
dt.on('draw', () => {
// Keep cache in sync when table is redrawn or data replaced
_rebuildRowCache();
Expand Down
Loading