Skip to content

Commit e460079

Browse files
eepMoodyblakewatsoncalumbellaugustjohnsonstevennoto
authored
Release API v 2.0.0 (#915)
* fixed parsing reaction conditions without parentheses (#842) * Fix spell data regressions and omissions (#844) * Fix spell data regressions from PR #842 and update newrelic API * add missing higher-leve options * add tests for duplicate or missing higher_level values * Add missing casting options for deepm and spells-that-dont-suck * fix freezing sphere being merged with freedom of movement * Convert distance fields to integer (#845) * Fix spell data regressions from PR #842 and update newrelic API * add missing higher-leve options * add tests for duplicate or missing higher_level values * Add missing casting options for deepm and spells-that-dont-suck * fix freezing sphere being merged with freedom of movement * convert ambiguously precise fields to integers * update test cases to reflect integers * update decimal speed fallbacks * fixed bugs in srd-2024 CreatureAction data (closes #847) (#849) * fixed markdown errors in Creature spellcasting traits/actions (#855) * updated srd-2014 dragon breath weapon recharge data (closes #848) (#853) * removed prepended asterisks from toh/tdcs FeatBenefit 'desc' fields (closes #851) (#852) * fixed bugs in srd-2024 spell markdown (closes #857) * updated monster conversion script to scrap input md for bonus actions and reactions * added missing srd-2024 creature reactions * removed Mithral and Adamantine Hide Armor from srd-2014 dataset (closes #829) * bugfix: added missing dash to bfrd mechanist starting equipment markdown * added 2024 champion subclass data to ClassFeatureItem.json * added srd-2024 College of Lore data to ClassFeatureItem.json * replaced casting_times of 'bonus_action' w/ 'bonus-action' as per model spec * wrote exclude_fields_mixin (and mvd mixins to own dir) * added ExcludeFieldsMixin to model viewsets * added missing srd-2024 dragon attack data to CreatureAttackAction * removed /manifest from url, updated test cases to reflect rmvl * rmv'd ManifestViewSet * removed ManifestSerializer * removed Manifest model * rmv'd manifest from v1 API schema * removed /version endpoint * added character creation rules from srd-2024 (#878) * Added filter on monsters for environments (#884) * fixed typo in srd-2024 Adult Green Dragon spellcasting action (#891) * [BUGFIX] Fixed data errors on `/v2/rulesets/srd_combat-sequence` (#893) * removed references to <srd:opportunity-attacks> in all open5e data * fixed ruleset/srd_combat-sequence blockquote markdown * added missing ClassFeatureItem for Fighter two extra attacks action (#895) * removed server/vector_index.pkl from repo (#883) * removed leading slashes on Image file_urls (#886) * [CI/CD] Upgrade Github Action versions to Node 24 compatable versions (#901) * updated checkout github action to v6 * updated setup-python gh action to v6 * updated upload-artifact gh action to v6 * updated build-push-action gh action to v7 * Feature: split V2 Item model into Item and MagicItem models (#889) * split v2 Item endpoint into Item and MagicItem endpoints * removed vector_index from commit * rmv'd accidently commited DDT config * updated buggy test case, see issue #888 * [BUGFIX] `GameContentSerializer` now inherits from `ModelSerializer` (#899) * GameContentSerializer now inherits from ModelSerializer * removed 'url' from GameContent Meta->fields prop * updated v2 tests to reflect removal of URL from many responses * fixed failing test * rmvd url field from MagicItemSerializer * Bugfix: seperated mixed up V1/V2 endpoints (#890) * updated api/urls.py to stop v1 and v2 endpoints getting mixed up * updated v1 tests to check against endpoints behind /v1/ subroute * [BUGFIX] Fixed EagerLoadingMixin early return error (#898) * fixed bug in EagerLoadingMixin conditional logic, closes #897 * fixed EagerLoadingMixin missing base case, added docstring * Bump django from 5.2.1 to 5.2.12 (#904) Bumps [django](https://github.com/django/django) from 5.2.1 to 5.2.12. - [Commits](django/django@5.2.1...5.2.12) --- updated-dependencies: - dependency-name: django dependency-version: 5.2.12 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump requests from 2.32.3 to 2.33.0 (#905) Bumps [requests](https://github.com/psf/requests) from 2.32.3 to 2.33.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.32.3...v2.33.0) --- updated-dependencies: - dependency-name: requests dependency-version: 2.33.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump urllib3 from 2.4.0 to 2.6.3 (#906) Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.4.0 to 2.6.3. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@2.4.0...2.6.3) --- updated-dependencies: - dependency-name: urllib3 dependency-version: 2.6.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump django from 5.2.12 to 5.2.13 (#908) Bumps [django](https://github.com/django/django) from 5.2.12 to 5.2.13. - [Commits](django/django@5.2.12...5.2.13) --- updated-dependencies: - dependency-name: django dependency-version: 5.2.13 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fixed bug in srd-2014 skeleton resistances/immunities (#907) * fixed markdown bugs in srd-2014 brass dragons (#912) * updated srd-2024 goliath giant ancestry markdown: added missing list bullets (#909) * consolidated CRs into single 'challenge_rating' field (#910) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Blake Watson <blake@blakewatson.com> Co-authored-by: calum <47755775+calumbell@users.noreply.github.com> Co-authored-by: calumbell <calumabell@googlemail.com> Co-authored-by: August Johnson <augustjohnson@users.noreply.github.com> Co-authored-by: Steven Noto <stevennoto@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 1dc42d8 commit e460079

172 files changed

Lines changed: 453465 additions & 450059 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_and_deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
echo "DOCKER_IMAGE_TAG=staging" >> $GITHUB_ENV
2626
fi
2727
- name: Build and push
28-
uses: docker/build-push-action@v4
28+
uses: docker/build-push-action@v7
2929
with:
3030
push: true
3131
tags: eepmoody/open5e-api:${{ env.DOCKER_IMAGE_TAG }}
@@ -35,7 +35,7 @@ jobs:
3535
needs: build
3636
steps:
3737
- name: Check out repository code
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v6
3939
- name: Install jq tool
4040
run: |
4141
sudo apt-get update

.github/workflows/clear_cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v6
1515

1616
- name: Make script executable
1717
run: chmod +x scripts/clear_cloudflare_cache.sh

.github/workflows/pr_validation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
run-tests:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: actions/setup-python@v4
14+
- uses: actions/checkout@v6
15+
- uses: actions/setup-python@v6
1616
with:
1717
python-version: '3.11'
1818
cache: pipenv
@@ -37,7 +37,7 @@ jobs:
3737
- name: Sanitize branch name
3838
run: echo "BRANCH_NAME=$(echo ${GITHUB_REF##*/} | tr '/' '-')" >> $GITHUB_ENV
3939
- name: Build Docker image
40-
uses: docker/build-push-action@v4
40+
uses: docker/build-push-action@v7
4141
with:
4242
push: false
4343
tags: open5e-api:${{ env.BRANCH_NAME }}

.github/workflows/rdme-openapi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
rdme-openapi:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-python@v5
17+
- uses: actions/checkout@v6
18+
- uses: actions/setup-python@v6
1919
with:
2020
python-version: "3.11"
2121

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v6
1414

1515
- name: Set up Python
16-
uses: actions/setup-python@v3
16+
uses: actions/setup-python@v6
1717
with:
1818
python-version: '3.11'
1919

@@ -24,7 +24,7 @@ jobs:
2424
working-directory: ${{ github.workspace }}
2525

2626
- name: Upload release asset
27-
uses: actions/upload-artifact@v3
27+
uses: actions/upload-artifact@v6
2828
with:
2929
name: codebase
3030

Pipfile.lock

Lines changed: 156 additions & 118 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ pipenv run python manage.py spectacular --color --file openapi-schema.yml` to bu
117117
```
118118

119119
# Contributing
120-
See [contribution guide](CONTRIBUTING.md).
120+
See [contribution guide](.github/CONTRIBUTING.md).
121121
# Tests
122122

123123
Tests are located in the `api/tests` directory. These should be run before pushing new changes to the main repository. These tests require that the api is [running](##run) at `http://localhost:8000`.

api/filters.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ class Meta:
7676

7777

7878
class MonsterFilter(CommonFilterSet):
79+
environments = django_filters.CharFilter(
80+
field_name="environments_json", lookup_expr="icontains"
81+
)
82+
7983
class Meta:
8084
model = models.Monster
8185
fields = {
@@ -91,6 +95,7 @@ class Meta:
9195
"hit_points": ["exact", "range", "gt", "gte", "lt", "lte"],
9296
"armor_class": ["exact", "range", "gt", "gte", "lt", "lte"],
9397
"type": ["iexact", "exact", "in", "icontains"],
98+
"environments_json": ["iexact", "exact", "in", "icontains"],
9499
"size": ["iexact", "exact", "in", "icontains"],
95100
"page_no": ["exact", "range", "gt", "gte", "lt", "lte"],
96101
"document__slug": [
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Generated by Django 5.2.9 on 2026-02-13 11:54
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('api', '0002_document_v2_related_key'),
10+
]
11+
12+
operations = [
13+
migrations.DeleteModel(
14+
name='Manifest',
15+
),
16+
]

api/models/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""
22
The initialization for models for open5e's api.
33
"""
4-
from .models import Manifest
54
from .models import Document
65
from .models import GameContent
76
from .models import CharClass

0 commit comments

Comments
 (0)