Merge pull request #551 from open5e/staging

Release 1.7.0

.github/workflows/build_and_deploy.yml

@@ -51,3 +51,7 @@ jobs:
         env:
           DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
         run: ./scripts/do_app_deploy.sh
+      - name: Run Smoke Test
+        run: | 
+          APP_URL=$(jq -r '.app.live_url' ./app.json)
+          python3 ./scripts/smoke_test.py --url $APP_URL

.github/workflows/code-review.yml

@@ -0,0 +1,30 @@
+name: Code Review
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  code_review_job:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    name: Automated Code Review
+    continue-on-error: true # allows test to pass even if no issues are found
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Automated Code Review
+        uses: eepMoody/genai-code-review@main
+        with:
+          args: '/usr/local/bin/python /app/src/main.py'
+          openai_api_key: ${{ secrets.OPENAI_API_KEY }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_pr_id: ${{ github.event.number }}
+          openai_model: 'gpt-4o' # most cost effective model at this time
+          openai_temperature: 0.5 # best balance between quality and cost

.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"