Skip to content

Commit

Permalink
Merge pull request #79 from ppfeufer/development
Browse files Browse the repository at this point in the history
[RELEASE] v1.16.3
  • Loading branch information
ppfeufer authored Sep 23, 2022
2 parents b3ba50d + 5b55547 commit c0af947
Show file tree
Hide file tree
Showing 22 changed files with 377 additions and 190 deletions.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

### Bug Description
Expand Down Expand Up @@ -32,7 +33,7 @@ If applicable, add screenshots to help explain your problem.

### Please complete the following information:

- AA-SRP Version:
- App Version:
- Alliance Auth Version:
- Browser and Version:

Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: Feature Request
about: Suggest an idea for AA SRP
about: Suggest an idea
title: "[Feature Request] "
labels: ''
assignees: ''

---

### Context
Expand Down
5 changes: 2 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ Fixes # (issue)

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not
work as expected)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)


## Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have commented on my code, particularly in hard-to-understand areas
- [ ] I have checked my code and corrected any misspellings
25 changes: 10 additions & 15 deletions .github/workflows/automated-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,12 @@ jobs:
database:
image: ${{ matrix.database }}
env:
MYSQL_ROOT_PASSWORD: foobar
MYSQL_ROOT_PASSWORD: temp_password_aa_tox_tests
MYSQL_DATABASE: tox_allianceauth
ports:
- 3306:3306
options: --tmpfs /var/lib/mysql

env:
DB_HOST: 127.0.0.1
DB_USER: root
DB_PASSWORD: foobar

steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -137,6 +132,9 @@ jobs:
env:
DJANGO: ${{ matrix.django-version }}
ALLIANCEAUTH: stable
DB_HOST: 127.0.0.1
DB_USER: root
DB_PASSWORD: temp_password_aa_tox_tests

- name: Upload Coverage Artifacts
if: ${{ github.event_name == 'pull_request' && matrix.python-version == '3.10' && matrix.django-version == '4.0' }}
Expand All @@ -152,15 +150,15 @@ jobs:
# runs-on: ubuntu-latest
#
# strategy:
# # Set Python and Django version to test for the stable release of AllianceAuth
# # Set Python and Django version to test for the alpha/beta release of AllianceAuth
# matrix:
# # Don't forget to change the Python version for [upload-coverage] as well
# # Python versions
# python-version:
# - '3.8'
# - '3.9'
# - '3.10'
# - '3.11-dev'
# # Don't forget to change the Django version for [upload-coverage] as well
# # Django versions
# django-version:
# - '4.0'
# # MySQL versions to test against
Expand All @@ -187,12 +185,6 @@ jobs:
# - 3306:3306
# options: --tmpfs /var/lib/mysql
#
# env:
# USE_MYSQL: True
# DB_HOST: 127.0.0.1
# DB_USER: root
# DB_PASSWORD: foobar
#
# steps:
# - name: Checkout
# uses: actions/checkout@v2
Expand All @@ -219,6 +211,9 @@ jobs:
# env:
# DJANGO: ${{ matrix.django-version }}
# ALLIANCEAUTH: testing
# DB_HOST: 127.0.0.1
# DB_USER: root
# DB_PASSWORD: temp_password_aa_tox_tests

# Coverage upload to Codecov and Codacy
upload-coverage:
Expand Down
22 changes: 19 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,21 @@ repos:
- id: check-yaml
- id: fix-byte-order-marker
- id: trailing-whitespace
exclude: \.(min\.css|min\.js|po|mo)$
exclude: |
(?x)(
.min\.css|
.min\.js|
.po|
.mo
)
- id: end-of-file-fixer
exclude: \.(min\.css|min\.js|po|mo)$
exclude: |
(?x)(
.min\.css|
.min\.js|
.po|
.mo
)
- id: mixed-line-ending
args: [ --fix=lf ]
- id: fix-encoding-pragma
Expand All @@ -31,7 +43,11 @@ repos:
rev: 2.6.1
hooks:
- id: editorconfig-checker
exclude: ^(LICENSE|aasrp/static/aasrp/libs/)
exclude: |
(?x)(
LICENSE|
static/aasrp/libs/
)
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
Expand Down
57 changes: 40 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,25 @@

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/)
The format is based on [Keep a Changelog]
and this project adheres to [Semantic Versioning]


## [In Development] - Unreleased


## [1.16.3] - 2022-09-23

### Added

- `aasrp_load_eve` can run without user interaction with the `--no-input` or
`--noinput` argument

### Changed

- Made request detail modals a bit larger


## [1.16.2] - 2022-09-15

### Fixed
Expand All @@ -20,9 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)

### Update Information

**This release includes all changes from
[1.16.0 (YANKED)](https://github.com/ppfeufer/aa-srp/releases/tag/v1.16.0) as well
as the following:**
**This release includes all changes from [v1.16.0 (YANKED)] as well as the following:**

If you already installed v1.16.0 and successfully ran migrations, please run the
following command **before** updating to this version.
Expand All @@ -47,6 +57,9 @@ If you haven't installed v1.16.0 yet, you can just update as usual.
- Python 3.11 from tests. AA is not tested yet with it, and it's not even stable at
the moment.

<!-- Links -->
[v1.16.0 (YANKED)]: https://github.com/ppfeufer/aa-srp/releases/tag/v1.16.0 "1.16.0 (YANKED)"


## [1.16.0] - 2022-08-04 [YANKED]

Expand Down Expand Up @@ -85,15 +98,19 @@ mySQL8**

### Added

- Tooltip to make it a bit more obvious that SRP payout values can be changed ([#72](https://github.com/ppfeufer/aa-srp/issues/72))
- Tooltip to make it a bit more obvious that SRP payout values can be changed ([#72])

![Tooltip: Change SRP Payout Amount](aasrp/images/tooltip-change-srp-payout-amount.png "Tooltip: Change SRP Payout Amount")
![Tooltip: Change SRP Payout Amount]

### Changed

- Moved SRP recalculation to its own function
- Highlight colour for SRP amount changed

<!-- Links and images -->
[#72]: https://github.com/ppfeufer/aa-srp/issues/72 "[Feature Request] Specify Payout Percentage on approving SRP"
[Tooltip: Change SRP Payout Amount]: aasrp/images/tooltip-change-srp-payout-amount.png "Tooltip: Change SRP Payout Amount"


## [1.15.1] - 2022-07-11

Expand Down Expand Up @@ -370,8 +387,10 @@ mySQL8**

### Added

- [EveTools kill board](https://kb.evetools.org/) as accepted source for SRP
request kill mails
- [EveTools Killboard] as accepted source for SRP request kill mails

<!-- Links -->
[EveTools Killboard]: https://kb.evetools.org/ "EveTools Killboard"


## [1.6.1] - 2021-07-01
Expand Down Expand Up @@ -482,11 +501,9 @@ mySQL8**
- Option for users to disable notifications for this module. When enabled, no
notifications will be sent at all. Neither in AA itself nor on Discord (if any of
the Discord apps is active)
- Check if [AA Discord Notify](https://gitlab.com/ErikKalkoken/aa-discordnotify) is
installed, which picks up on notifications in Auth and relays them to the
respective user as Discord PM. This way we don't send double notifications to the
user if [AA-Discordbot](https://github.com/pvyParts/allianceauth-discordbot) is
installed as well.
- Check if [AA Discord Notify] is installed, which picks up on notifications in Auth
and relays them to the respective user as Discord PM. This way we don't send
double notifications to the user if [AA-Discordbot] is installed as well.

### Changed

Expand All @@ -498,8 +515,7 @@ mySQL8**
### Added

- Option to notify the SRP team in their Discord channels about new SRP requests. (You
need to have [AA-Discordbot](https://github.com/pvyParts/allianceauth-discordbot)
installed and configured to use this option)
need to have [AA-Discordbot] installed and configured to use this option)


## [1.0.1] - 2021-02-09
Expand Down Expand Up @@ -528,7 +544,7 @@ some manual work, so please update step by step.**

- More details to notifications
- Discord notification via PM to the user on SRP request approval or rejection, if
[AA-Discordbot](https://github.com/pvyParts/allianceauth-discordbot) is installed
[AA-Discordbot] is installed


## [0.1.0-beta.16] - 2021-02-06
Expand Down Expand Up @@ -725,3 +741,10 @@ python manage.py aasrp_update_db_relations
## [0.1.0-beta.3] - 2020-12-28

- First public beta release


<!-- Links -->
[Keep a Changelog]: http://keepachangelog.com/ "Keep a Changelog"
[Semantic Versioning]: http://semver.org/ "Semantic Versioning"
[AA Discord Notify]: https://gitlab.com/ErikKalkoken/aa-discordnotify "AA Discord Notify"
[AA-Discordbot]: https://github.com/pvyParts/allianceauth-discordbot "AA-Discordbot"
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ make coverage
The full tox-test suite can be run via:

```shell
tox
make tox_tests
```
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,4 @@ build_test:

tox_tests:
export USE_MYSQL=False && \
tox && \
rm -rf .tox/
tox
Loading

0 comments on commit c0af947

Please sign in to comment.