merging staging into feature branch to fix GameSystem endpoint name

Author: calumbell

.github/workflows/pr_validation.yml

@@ -27,6 +27,9 @@ jobs:
           pipenv run python manage.py runserver 0.0.0.0:8000 &
           sleep 5 &&
           pipenv run pytest
+      - name: Validate Data
+        run: |
+          pipenv run python ./scripts/data_test.py --dir ./data/v2
   build:
     runs-on: ubuntu-latest
     steps:

CONTRIBUTING.md

@@ -79,7 +79,7 @@ it with the content you add.
   create a new one.
 - `Publisher`: The publisher of the source. Select one of the available publishers. If the publisher is not available, 
   create a new one.
-- `Ruleset`: The ruleset the source is associated with. Select one of the available rulesets. If the ruleset is not available, 
+- `GameSystem`: The gamesystem the source is associated with. Select one of the available gamesystems. If the gamesystem is not available, 
   create a new one.
 - `Author`: The author of the source. This can be a single author or a list of authors. List them in the format `Author 1, Author 2, Author 3`.
 - `Published at`: The Date and Time the source was published. Select the date it was published on. The time can be set to 00:00:00.

Dockerfile

@@ -17,4 +17,4 @@ RUN pipenv run python manage.py quicksetup
 RUN rm .env
 
 #run gunicorn.
-CMD ["pipenv", "run", "gunicorn","-b", ":8888", "server.wsgi:application"]
+CMD ["pipenv", "run", "gunicorn","-b", ":8888", "server.wsgi:application"]

Pipfile

@@ -4,32 +4,20 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "3"
+django = "5.*"
 djangorestframework = "*"
 django-filter = "*"
 django-cors-headers = "*"
-django-haystack = "*"
-drf-haystack = "*"
-gunicorn = "*"
-jsonfield = "*"
-markdown = "*"
-"markdown2" = "*"
-pylint = "*"
-python-decouple = "*"
-setuptools = "*"
-whitenoise = "*"
-whoosh = "*"
-pyyaml = "*"
-uritemplate = "*"
 newrelic = "*"
-approvaltests = "*"
-pytest-approvaltests = "*"
 requests = "*"
-chardet = "*"
+whitenoise = "*"
+gunicorn = "*"
 
 [dev-packages]
 pytest = "*"
 pytest-django = "*"
+approvaltests = "*"
+pytest-approvaltests = "*"
 
 [requires]
 python_version = "3.11"

Pipfile.lock

@@ -4,7 +4,7 @@
   <p align="center">
     <a href="https://open5e.com">https://open5e.com</a>
     <br/>
-    A JSON API for the D&D 5e ruleset
+    A JSON API for the D&D 5e gamesystem
   </p>
 </p>
 <br />

README.md

@@ -88,6 +88,7 @@ def collect_static() -> None:
 def build_haystack_index() -> None:
     """Freshen the haystack search indexes. This is an internal haystack
     API that is being called, and only applies to v1 data."""
+    print("THIS ENTIRE COMMAND HAS BEEN DEPRECATED! EXPECT ERRORS.")
     call_command('update_index', '--remove')
 
 def build_v1v2_searchindex() -> None: