Skip to content

Commit

Permalink
Dep patches (#705)
Browse files Browse the repository at this point in the history
* add trak org access for testuser1

* update sqlparse

* update gunicorn to 22

* remove push trigger for pushes to main for CodeQL workflow (since this will alerady need to be run from a PR)
  • Loading branch information
dpgraham4401 authored Apr 19, 2024
1 parent 88521c9 commit d9fc6a4
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 40 deletions.
73 changes: 36 additions & 37 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [ "main" ]
branches-ignore: ['main']
pull_request:
branches: [ "main" ]
branches: ['main']
schedule:
- cron: '40 4 * * 4'

Expand All @@ -26,39 +26,38 @@ jobs:
fail-fast: false
matrix:
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
language: [ 'javascript-typescript', 'python' ]
language: ['javascript-typescript', 'python']

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
- name: Checkout repository
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: '/language:${{matrix.language}}'
5 changes: 5 additions & 0 deletions server/fixtures/dev_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,11 @@
fields:
name: Generators Org LLC
admin: 8062d496-15f1-485d-961c-a8e5fa118dde
- model: org.trakorgaccess
pk: 1
fields:
org: efb9e104-7f61-4365-a9af-9d7b55c854c4
user: 4ac96f68-42cf-47ea-bffb-f24d423dbc35
- model: profile.trakprofile
pk: c65dbee9-b6bf-400e-93e0-90a749cc2939
fields:
Expand Down
5 changes: 2 additions & 3 deletions server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
asgiref==3.8.1
Django==5.0.4
django-celery-results==2.5.1
django-cors-headers==4.3.1
django-extensions==3.2.3
django-celery-beat==2.6.0
djangorestframework==3.15.1
gunicorn==21.2.0
gunicorn==22.0.0
emanifest==4.0.2
psycopg[binary]==3.1.18
pytz==2024.1
sqlparse==0.4.4
sqlparse==0.5.0
tzdata==2024.1
whitenoise==6.6.0
celery==5.3.6
Expand Down

0 comments on commit d9fc6a4

Please sign in to comment.