Skip to content

Commit

Permalink
Merge pull request #91 from ppfeufer/development
Browse files Browse the repository at this point in the history
[RELEASE] v1.17.1
  • Loading branch information
ppfeufer authored Apr 13, 2023
2 parents 28199ce + afd20e9 commit 7af94c3
Show file tree
Hide file tree
Showing 18 changed files with 4,731 additions and 1,913 deletions.
40 changes: 3 additions & 37 deletions .github/workflows/automated-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,42 +33,9 @@ jobs:
- name: Run Pre Commit Checks
uses: pre-commit/[email protected]

# Codacy Security Scan
codacy-security-scan:
needs: [pre-commit]
name: Codacy Security Scan
runs-on: ubuntu-latest

steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout
uses: actions/checkout@main

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@master
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
verbose: true
output: results.sarif
format: sarif
# Adjust severity of non-security issues
gh-code-scanning-compat: true
# Force 0 exit code to allow SARIF file generation
# This will hand over control about PR rejection to the GitHub side
max-allowed-issues: 2147483647

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@main
with:
sarif_file: results.sarif

# Run Test Coverage
test-coverage-aa-stable:
needs: [ codacy-security-scan ]
needs: [pre-commit]
name: AA Latest (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} with ${{ matrix.database }})
runs-on: ubuntu-latest

Expand Down Expand Up @@ -265,11 +232,10 @@ jobs:
- name: Checkout
uses: actions/checkout@main

# Minimum supported Python version by AllianceAuth
- name: Set up Python 3.8
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.8' # Minimum supported Python version by AllianceAuth

- name: Install Tools
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pypi-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- name: Checkout
uses: actions/checkout@main

- name: Set up Python 3.8
uses: actions/setup-python@v2
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.8' # Minimum supported Python version by AllianceAuth

- name: Install Tools
run: |
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning]
## [In Development] - Unreleased


## [1.17.1] - 2023-04-13

### Changed

- German translation updated


## [1.17.0] - 2023-03-06

### Added
Expand Down
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,13 @@ The full tox-test suite can be run via:
```shell
make tox_tests
```


## Translation

This app is fully translation-ready and translations are handled via [Weblate]. If
you like to contribute to the app's translation or simply improve it, feel free to
register on my [Weblate] site and message me so I can add you to the right group.

<!-- Links -->
[Weblate]: https://weblate.ppfeufer.de/ "Weblate"
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@ help:

translationfiles:
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 fr_FR --ignore 'build/*' && \
django-admin makemessages -l it_IT --ignore 'build/*' && \
django-admin makemessages -l ja --ignore 'build/*' && \
django-admin makemessages -l ko_KR --ignore 'build/*' && \
django-admin makemessages -l ru --ignore 'build/*' && \
django-admin makemessages -l zh_Hans --ignore 'build/*'

compiletranslationfiles:
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 fr_FR && \
django-admin compilemessages -l it_IT && \
django-admin compilemessages -l ja && \
django-admin compilemessages -l ko_KR && \
django-admin compilemessages -l ru && \
django-admin compilemessages -l zh_Hans

Expand Down
4 changes: 2 additions & 2 deletions aasrp/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""
A couple of variable to use throughout the app
A couple of variables to use throughout the app
"""

__version__ = "1.17.0"
__version__ = "1.17.1"
__title__ = "Ship Replacement"
Binary file modified aasrp/locale/de/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit 7af94c3

Please sign in to comment.