Merge pull request #142 from ppfeufer/repo-updates-and-next-version

Repo updates and next version

.github/dependabot.yml

@@ -4,6 +4,6 @@ updates:
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "development"
+    target-branch: "master"
     schedule:
       interval: "daily"

.github/workflows/automated-checks.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version-file: 'pyproject.toml' # Read python version from a file pyproject.toml
 
       - name: Run Pre Commit Checks
         uses: pre-commit/[email protected]
@@ -246,7 +246,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8' # Minimum supported Python version by AllianceAuth
+          python-version-file: 'pyproject.toml' # Read python version from a file pyproject.toml
 
       - name: Install Tools
         run: |

.github/workflows/pypi-release.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8' # Minimum supported Python version by AllianceAuth
+          python-version-file: 'pyproject.toml' # Read python version from a file pyproject.toml
 
       - name: Install Tools
         run: |

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ ci:
 
     for more information, see https://pre-commit.ci
   autofix_prs: false
-  autoupdate_branch: 'development'
+  autoupdate_branch: 'master'
   autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
   autoupdate_schedule: weekly
   skip: []

CHANGELOG.md

@@ -7,14 +7,18 @@ and this project adheres to [Semantic Versioning]
 
 ## \[In Development\] - Unreleased
 
+## \[1.20.8\] - 2023-09-26
+
 ### Fixed
 
 - Capitalization for translatable strings
 
 ### Changed
 
-- Use `clean_setting` function from `allianceauth´app-utils` instead of reinventing the
+- Use `clean_setting` function from `allianceauth-app-utils` instead of reinventing the
   wheel and have our own
+- Translations updated
+- Test suite updated
 
 ## \[1.20.7\] - 2023-09-14
 
@@ -895,5 +899,5 @@ python manage.py aasrp_update_db_relations
 [evetools killboard]: https://kb.evetools.org/ "EveTools Killboard"
 [keep a changelog]: http://keepachangelog.com/ "Keep a Changelog"
 [semantic versioning]: http://semver.org/ "Semantic Versioning"
-[tooltip: change srp payout amount]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/aasrp/docs/screenshots/tooltip-change-srp-payout-amount.png "Tooltip: Change SRP Payout Amount"
+[tooltip: change srp payout amount]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/docs/images/tooltip-change-srp-payout-amount.png "Tooltip: Change SRP Payout Amount"
 [v1.16.0 (yanked)]: https://github.com/ppfeufer/aa-srp/releases/tag/v1.16.0 "1.16.0 (YANKED)"

CONTRIBUTING.md

@@ -14,8 +14,8 @@ ______________________________________________________________________
       - [Minified CSS](#minified-css)
     - [pre-commit](#pre-commit)
   - [Branching and Contributing via Pull Requests](#branching-and-contributing-via-pull-requests)
-  - [Tests](#tests)
-  - [Checklist](#checklist)
+    - [Tests](#tests)
+    - [Checklist](#checklist)
   - [Translation](#translation)
 
 <!-- mdformat-toc end -->
@@ -48,14 +48,15 @@ pre-commit run black
 
 ### JavaScript<a name="javascript"></a>
 
-The JavaScript code follows [ECMAScript 6 (or ES6 for short)][ecmascript 6] or later
+The JavaScript code follows [ECMAScript 6 (or ES6 for short)][ecmascript 6] or newer
 rules. The use of arrow functions is preferred and `this` or `$(this)` should be
 prevented. Functions need to be declared before their use and the JavaScript code
 should follow `'use strict';`.
 
 Indent size: 4 spaces
 
 A linter configuration is declared as `.eslintrc.json` in the app's root directory.
+Do not change this file.
 
 To check that your JavaScript code adheres to the rules, run:
 
@@ -76,10 +77,11 @@ uglifyjs script.js -o script.min.js --source-map "url='script.min.js.map'" --com
 
 ### CSS<a name="css"></a>
 
-The CSS should be written in a modern manner. Colour definitions should be in RGB(A)
-(`rgb(255 255 255)`, `rgba(255 255 255 / 50%)`) for example.
+The CSS should be written in a modern manner. Colour definitions should be in
+modern RGB(A) (`rgb(255 255 255)`, `rgba(255 255 255 / 50%)`) for example.
 
-A linter configuration is declared as `.stylelintrc.json` in the app's root directory.
+A linter configuration is declared as `.stylelintrc.json` in the app's root
+directory. Do not change this file.
 
 Indent size: 4 spaces
 
@@ -139,10 +141,11 @@ The following will be checked by `pre-commit` (among others):
 ## Branching and Contributing via Pull Requests<a name="branching-and-contributing-via-pull-requests"></a>
 
 To contribute code via pull request, make sure that you fork the repository and
-branch your changes from the `development` branch. We strongly recommend to create a
-new branch for every new feature or change you plan to be submitting as merge request.
+branch your changes from the `master` branch.
 
-Only pull requests towards the `development` branch will be considered.
+We strongly recommend to create 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
+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
@@ -153,7 +156,7 @@ finished developing to flag that you are working on a specific topic. Merge requ
 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.
 
-## Tests<a name="tests"></a>
+### Tests<a name="tests"></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.
@@ -166,7 +169,7 @@ addition we are using some following 3rd party test tools:
 - [tox] - Running the test suite
 - [coverage] - Measuring the test coverage
 
-## Checklist<a name="checklist"></a>
+### Checklist<a name="checklist"></a>
 
 Before you submit a pull request, please make sure that:
 

README.md

@@ -213,11 +213,11 @@ Please make sure to read the [Contribution Guidelines].\
 [discord proxy]: https://gitlab.com/ErikKalkoken/discordproxy "Discord Proxy"
 [eve universe]: https://gitlab.com/ErikKalkoken/django-eveuniverse "Eve Universe"
 [evetools killboard]: https://kb.evetools.org/ "EveTools Killboard"
-[image: aa srp dashboard]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/aasrp/docs/screenshots/aa-srp-dashboard.jpg "AA SRP Dashboard"
-[image: aa srp dashboard (view all)]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/aasrp/docs/screenshots/aa-srp-dashboard-view-all.jpg "AA SRP Dashboard (View All)"
-[image: srp request details]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/aasrp/docs/screenshots/aa-srp-request-details.jpg "SRP Request Details"
-[image: srp requests overview]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/aasrp/docs/screenshots/aa-srp-requests-overview.jpg "SRP Requests Overview"
-[image: your srp requests view]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/aasrp/docs/screenshots/aa-srp-your-requests.jpg "Your SRP Requests View"
+[image: aa srp dashboard]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/docs/images/aa-srp-dashboard.jpg "AA SRP Dashboard"
+[image: aa srp dashboard (view all)]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/docs/images/aa-srp-dashboard-view-all.jpg "AA SRP Dashboard (View All)"
+[image: srp request details]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/docs/images/aa-srp-request-details.jpg "SRP Request Details"
+[image: srp requests overview]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/docs/images/aa-srp-requests-overview.jpg "SRP Requests Overview"
+[image: your srp requests view]: https://raw.githubusercontent.com/ppfeufer/aa-srp/master/docs/images/aa-srp-your-requests.jpg "Your SRP Requests View"
 [ppfeufer on ko-fi]: https://ko-fi.com/N4N8CL1BY
 [pre-commit.ci status]: https://results.pre-commit.ci/latest/github/ppfeufer/aa-srp/master "pre-commit.ci"
 [support discord]: https://discord.gg/zmh52wnfvM

pyproject.toml

@@ -6,7 +6,7 @@ requires = [
 
 [project]
 name = "aa-srp"
-version = "1.20.7"
+version = "1.20.8"
 description = "Improved SRP Module for Alliance Auth"
 readme = "README.md"
 keywords = [
@@ -18,7 +18,7 @@ license = {file = "LICENSE"}
 authors = [
     { name = "Peter Pfeufer", email = "[email protected]" },
 ]
-requires-python = "~=3.8"
+requires-python = ">=3.8"
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",