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
5 changes: 2 additions & 3 deletions .github/workflows/automated-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jobs:
matrix:
python-version:
# https://endoflife.date/python
- '3.10' # [EOL] End of Life: 31 Oct 2026
- '3.11' # [EOL] End of Life: 31 Dec 2027
- '3.12' # [EOL] End of Life: 31 Dec 2028
- '3.13' # [EOL] End of Life: 31 Oct 2029
Expand Down Expand Up @@ -98,7 +97,7 @@ jobs:

# Install redis
- name: Install redis
uses: shogo82148/actions-setup-redis@v1.57.0
uses: shogo82148/actions-setup-redis@v1.58.0
with:
redis-version: ${{ env.REDIS_VERSION }}

Expand Down Expand Up @@ -200,7 +199,7 @@ jobs:
#
# # Install redis
# - name: Install redis
# uses: shogo82148/actions-setup-redis@v1.57.0
# uses: shogo82148/actions-setup-redis@v1.58.0
# with:
# redis-version: ${{ env.REDIS_VERSION }}
#
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ repos:
name: PyUpgrade
description: Upgrade syntax to newer versions of Python.
args:
- --py310-plus # Minimum required Python version for AA. Update as needed.
- --py311-plus # Minimum required Python version for AA. Update as needed.

- repo: https://github.com/pycqa/flake8
rev: cfbbfdeb2391c14a37e101e92a77f54f329e1726 # frozen: 7.4.1
Expand Down Expand Up @@ -242,7 +242,7 @@ repos:
name: Black
description: Format Python code.
args:
- --target-version=py310 # Minimum required Python version for AA. Update as needed.
- --target-version=py311 # Minimum required Python version for AA. Update as needed.

- repo: https://github.com/asottile/blacken-docs
rev: dda8db18cfc68df532abf33b185ecd12d5b7b326 # frozen: 1.20.0
Expand All @@ -253,7 +253,7 @@ repos:
additional_dependencies:
- black==26.10.0 # https://github.com/psf/black/releases/latest
args:
- --target-version=py310 # Minimum required Python version for AA. Update as needed.
- --target-version=py311 # Minimum required Python version for AA. Update as needed.

- repo: https://github.com/executablebooks/mdformat
rev: 2d496dbc18e31b83a1596685347ffe0b6041daf0 # frozen: 1.0.0
Expand Down Expand Up @@ -299,7 +299,7 @@ repos:
name: Pylint
description: Check for errors and code smells in Python code.
args:
- --py-version=3.10 # Minimum required Python version for AA. Update as needed.
- --py-version=3.11 # Minimum required Python version for AA. Update as needed.

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 4f85d46a92dc17713078e5de73f8a13190edf6fc # frozen: 0.38.2
Expand Down
35 changes: 25 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ______________________________________________________________________
- [Minified CSS](#minified-css)
- [pre-commit](#pre-commit)
- [Branching and Pull Requests](#branching-and-pull-requests)
- [Please Do NOT](#please-do-not)
- [Tests](#tests-1)
- [Checklist](#checklist)

Expand Down Expand Up @@ -91,13 +92,17 @@ project root to see all available targets.

Some make targets for Django related tasks use the `manage.py` file.
You probably need to provide the absolute path to your `myauth` directory for it to work.
You can do so by providing a `.make/myauth-path` file in the project root with the
following content:
You can do so by providing a `.make/config-overrides.ini` file with the following
content:

```makefile
/absolute/path/to/myauth
```ini
[Django]
myauth_path = /absolute/path/to/myauth
```

In this file you can override any other settings as well. See the `.make/config.ini`
file for all available settings.

#### General<a name="general"></a>

- `make help` - Show all available make targets
Expand Down Expand Up @@ -262,22 +267,32 @@ To contribute code via pull request, make sure you fork the repository and branc
changes from the `master` branch.

We strongly recommend creating a new branch for every new feature or change you
plan to be submitting as merge request. Please make sure to keep the `master` branch of
plan to be submitting as pull request. Please make sure to keep the `master` branch of
your fork in sync with the main repository to avoid conflicts.

Before you start working on a new feature, please open an Issue (Type: Feature
Request) and start a discussion if your idea is generally wanted and considered a
good addition to the app in general.

Please feel free to create your merge request early and while you are still not
finished developing to flag that you are working on a specific topic. Merge requests
Please feel free to create your pull request early and while you are still not
finished developing to flag that you are working on a specific topic. Pull requests
that are not yet ready to review should be marked as DRAFT. You can signal others
that your merge request is ready for review by removing the DRAFT flag again.
that your pull request is ready for review by removing the DRAFT flag again.

#### Please Do NOT<a name="please-do-not"></a>

- Create a pull request for a new feature without prior discussion in an Issue
- Update the version number in `__init__.py` yourself, this will be done by the
maintainer when a new release is made
- Update the `CHANGELOG.md` yourself, this will be done by the maintainer when your
contribution is merged
- Update the translation template file yourself, this will be done by the maintainer
when your contribution is merged

#### Tests<a name="tests-1"></a>

Please update existing or provide additional unit tests for your changes. Note that
your merge request might fail if it reduces the current level of test coverage.
your pull request might fail if it reduces the current level of test coverage.

We are using [Python unittest] with the Django `TestCase` class for all tests. In
addition, we are using some following third party test tools:
Expand All @@ -300,7 +315,7 @@ Before you submit a pull request, please make sure that:
<!-- Links -->

[aa guide for setting up a dev environment]: https://allianceauth.readthedocs.io/en/latest/development/dev_setup/aa-dev-setup-wsl-vsc-v2.html "AA Guide for Setting up a Dev Environment"
[black code style]: https://black.readthedocs.io/en/latest/l "Black Code Style"
[black code style]: https://black.readthedocs.io/en/latest/ "Black Code Style"
[code of conduct]: CODE_OF_CONDUCT.md "Code of Conduct"
[coverage]: https://coverage.readthedocs.io/en/latest/ "coverage"
[developer license agreement]: https://developers.eveonline.com/license-agreement "Developer License Agreement"
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ license = { file = "LICENSE" }
authors = [
{ name = "Peter Pfeufer", email = "develop@ppfeufer.de" },
]
requires-python = ">=3.10,<3.15"
requires-python = ">=3.11,<3.15"
classifiers = [
"Environment :: Web Environment",
"Framework :: Django",
Expand All @@ -26,7 +26,6 @@ classifiers = [
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires =
tox>=4.2
env_list =
allianceauth-{latest}
py{314, 313, 312, 311, 310}
py{314, 313, 312, 311}
no_package = true
usedevelop = true

Expand Down
Loading