Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2025.1 release #62

Merged
merged 116 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
49769ab
updates - fixes CSP
saxix Nov 23, 2023
9c2d6d9
Switched to mailjet
srugano Nov 28, 2023
031be7e
updates deps
saxix Nov 28, 2023
e3f66ec
fixes upgrade.py
saxix Nov 28, 2023
2c57de3
Added mailjet settings
srugano Nov 28, 2023
c7f5d53
Merged develop
srugano Nov 28, 2023
31ea127
Merge pull request #34 from unicef/feature/mailjet
domdinicola Dec 4, 2023
1d8847e
Update azure-pipelines.yml for Azure Pipelines
domdinicola Dec 11, 2023
708400d
Update azure-pipelines.yml for Azure Pipelines
domdinicola Dec 11, 2023
84a574f
generate password action
domdinicola Dec 11, 2023
deeead0
Merge pull request #35 from unicef/aurora-generate-action
domdinicola Dec 11, 2023
1389490
pdm
domdinicola Dec 11, 2023
c763ba0
Merge pull request #36 from unicef/pdm
domdinicola Dec 18, 2023
b9a305d
update pdm
domdinicola Dec 18, 2023
272baf8
path tweaks
domdinicola Dec 18, 2023
8350677
fix upgrade
domdinicola Dec 18, 2023
d6536d6
update libraries
domdinicola Dec 18, 2023
d579f67
Merge pull request #37 from unicef/update-libraries
domdinicola Dec 19, 2023
8d537e0
django 4.2
domdinicola Dec 19, 2023
80f7c09
Merge pull request #38 from unicef/dj5
domdinicola Feb 27, 2024
5a7f1c2
locl
domdinicola Mar 16, 2024
3413d63
add license
domdinicola Apr 29, 2024
743c23e
fragments
domdinicola May 2, 2024
e2c47d2
Merge pull request #40 from unicef/fragments
domdinicola May 2, 2024
7cf0fc7
warnings
domdinicola May 3, 2024
2085181
Merge pull request #41 from unicef/warnings
domdinicola May 3, 2024
a2c2903
fix?
domdinicola May 24, 2024
606a7e8
fix charts
domdinicola May 24, 2024
8ff5f93
Merge pull request #42 from unicef/fix-chart-201980
domdinicola May 24, 2024
3052ae9
docker tweaks
domdinicola Sep 24, 2024
dc080b6
Merge pull request #45 from unicef/docker-tweaks
domdinicola Sep 25, 2024
81ab778
code clean and doc
saxix Sep 25, 2024
9af2385
fixes tests
saxix Sep 25, 2024
40bc9f9
updates django version
saxix Oct 4, 2024
c606800
updates trivy CI
saxix Oct 4, 2024
bc5c2ea
Merge pull request #47 from unicef/feature/os
domdinicola Oct 7, 2024
a0e813a
Merge pull request #48 from unicef/develop
domdinicola Oct 7, 2024
a14f122
allow fail on trivy
domdinicola Oct 7, 2024
b96950a
Merge branch 'develop' into staging
domdinicola Oct 7, 2024
48d01cb
add project and organization filters to API
saxix Oct 14, 2024
a6b6d2f
add org/prj to Records API
saxix Oct 14, 2024
23a7fdc
add project and organization filters to API
saxix Oct 14, 2024
203ef4f
add org/prj to Records API
saxix Oct 14, 2024
b1a4440
updates serializer
saxix Oct 14, 2024
5f66b80
updates docjer Makefile
saxix Oct 14, 2024
7615050
fragments tweaks
domdinicola Oct 17, 2024
c71f54f
Merge pull request #49 from unicef/fixes
domdinicola Oct 17, 2024
7400f24
fragments tweaks
domdinicola Oct 17, 2024
5867bd5
Merge pull request #50 from unicef/fixes
domdinicola Oct 17, 2024
d348537
fragments tweaks
domdinicola Oct 17, 2024
f390db1
fragments tweaks
domdinicola Oct 17, 2024
21c7b70
Merge pull request #51 from unicef/fixes
domdinicola Oct 17, 2024
3c206f4
gic
domdinicola Oct 17, 2024
597c960
updates MAkefile
saxix Oct 22, 2024
3ed2ace
fixex RegistrationAdmin search collation
saxix Oct 22, 2024
d6468a9
fixex ProjectAdmin search collation
saxix Oct 22, 2024
5a908ea
fixes collation
saxix Oct 22, 2024
49a94cc
fixes qs
saxix Oct 22, 2024
c61cb1b
Merge branch 'develop' into staging
domdinicola Oct 22, 2024
003f412
move from pdm to uv
saxix Oct 31, 2024
d782eeb
updates CI
saxix Oct 31, 2024
afbf402
add CI actions
saxix Nov 1, 2024
068a432
lint
saxix Nov 1, 2024
032c435
fixes CI
saxix Nov 1, 2024
702d5b8
lint
saxix Nov 1, 2024
cfc4697
add docs CI
saxix Nov 1, 2024
2ca5a00
add docs CI
saxix Nov 1, 2024
fbf022a
updates pre-commit config
saxix Nov 1, 2024
dde65c2
updates pre-commit config
saxix Nov 1, 2024
ec10780
updates pre-commit config
saxix Nov 1, 2024
c04c54e
updates CI
saxix Nov 1, 2024
d3a50ed
updates CI
saxix Nov 1, 2024
515be09
updates deps
saxix Nov 1, 2024
37ebd4b
updates CI
saxix Nov 1, 2024
5f6b2cb
updates nginx conf
saxix Nov 29, 2024
0084160
updates deps
saxix Nov 29, 2024
a04912f
updates Dockerfile
saxix Nov 29, 2024
25e3fc0
updates api
saxix Nov 30, 2024
3c5760b
updates
saxix Nov 30, 2024
e8eee4f
updates footer
saxix Nov 30, 2024
55a86c8
updates template footer
saxix Nov 30, 2024
8868595
updates nginx conf
saxix Nov 29, 2024
918ad9d
updates deps
saxix Nov 29, 2024
398f323
updates footer
saxix Nov 30, 2024
0396327
updates template footer
saxix Nov 30, 2024
8f74a42
move from pdm to uv
saxix Oct 31, 2024
84fd375
add docs CI
saxix Nov 1, 2024
8ae9210
updates pre-commit config
saxix Nov 1, 2024
6df6877
updates CI
saxix Nov 1, 2024
5c9af50
uv package manager
saxix Dec 1, 2024
65dae01
rebase
saxix Dec 2, 2024
d4d168e
lint
saxix Dec 2, 2024
bd518d4
removes unused file
saxix Dec 2, 2024
0b57504
Merge branch 'feature/uv' into develop
saxix Dec 2, 2024
f90b85f
updates CI
saxix Dec 2, 2024
bd98f1f
updates Dockerfile
saxix Jan 10, 2025
0bca497
updates ngnix port
saxix Jan 10, 2025
da60a63
Merge branch 'develop' into staging
domdinicola Jan 10, 2025
02d41de
docs
domdinicola Jan 10, 2025
c0fa9ee
Merge pull request #55 from unicef/docs
domdinicola Jan 10, 2025
7c14d50
ruff & dj5
domdinicola Jan 11, 2025
f35f9bb
Merge pull request #56 from unicef/ruff
domdinicola Jan 20, 2025
c530489
Merge branch 'develop' into staging
domdinicola Jan 20, 2025
4f8ffeb
fix ci
domdinicola Jan 21, 2025
314374a
Merge pull request #58 from unicef/bugfix/fix-ci
domdinicola Jan 22, 2025
440082b
dj5
domdinicola Jan 22, 2025
baf079f
Merge pull request #60 from unicef/feature/dj5
domdinicola Jan 22, 2025
7cfca34
fix sysinfo
domdinicola Jan 25, 2025
cd40c0a
Merge branch 'develop' into staging
domdinicola Jan 25, 2025
82ba77d
fix aurora sync
domdinicola Jan 29, 2025
359583f
Merge branch 'develop' into staging
domdinicola Jan 29, 2025
3fb66b5
fix
domdinicola Jan 31, 2025
3ea84fd
Merge branch 'develop' into staging
domdinicola Jan 31, 2025
5e0d721
Merge branch 'master' into staging
domdinicola Jan 31, 2025
9b2e3fc
update lock
domdinicola Feb 19, 2025
2e7a956
comment middleware
domdinicola Feb 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ node_modules
src/*.egg-info
src/aurora/staticfiles/
Makefile
README.md
manage.py
11 changes: 11 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
SECRET_KEY=secret-key

DATABASE_URL=psql://postgres:postgres@db:5432/postgres
CACHE_DEFAULT=redis://redis:6379/0
STATIC_URL=/static/
STATIC_ROOT=/var/static/

POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=postgres
POSTGRES_HOST=db
15 changes: 13 additions & 2 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,20 @@ max-complexity = 20
max-line-length = 120
exclude =
~*
ignore = E401,W391,E128,E261,E731,Q000,W504,W606,W503
putty-ignore =
.venv,
venv,
.git,
__pycache__,
build,
dist,
migrations,
snapshots,
__pypackages__,

ignore = E401,W391,E128,E261,E731,Q000,W504,W606,W503,E203
;putty-ignore =
; tests/test_choice_as_instance.py : E501

per-file-ignores =
*/__init__.py:F401,F403
*/migrations/*:E501
31 changes: 31 additions & 0 deletions .github/actions/last_commit/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: 'Get Last commit'
description: ''


outputs:
last_commit_sha:
description: 'last_commit_sha'
value: ${{ steps.result.outputs.last_commit_sha }}
last_commit_short_sha:
description: 'last_commit_short_sha'
value: ${{ steps.result.outputs.last_commit_short_sha }}

runs:
using: "composite"
steps:
- name: Setup Environment (PR)
if: ${{ github.event_name == 'pull_request' }}
shell: bash
run: |
echo "LAST_COMMIT_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
- name: Setup Environment (Push)
if: ${{ github.event_name == 'push' }}
shell: bash
run: |
echo "LAST_COMMIT_SHA=${GITHUB_SHA}" >> $GITHUB_ENV
- id: result
shell: bash
run: |
raw=${{env.LAST_COMMIT_SHA}}
echo "last_commit_sha=$raw" >> $GITHUB_OUTPUT
echo "last_commit_short_sha=${raw::8}" >> $GITHUB_OUTPUT
45 changes: 45 additions & 0 deletions .github/file-filters.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# This is used by the action https://github.com/dorny/paths-filter
docker: &docker
- added|modified: './docker/**/*'
- added|modified: './docker/*'

dependencies: &dependencies
- 'pdm.lock'
- 'pyproject.toml'

actions: &actions
- added|modified: './.github/**/*'

python: &python
- added|modified: 'src/**'
- added|modified: 'tests/**'
- 'manage.py'

changelog:
- added|modified: 'changes/**'
- 'CHANGELOG.md'

mypy:
- *python
- 'mypy.ini'

run_tests:
- *actions
- *python
- *docker
- *dependencies
- 'pytest.ini'

migrations:
- added|modified: 'src/**/migrations/*'

lint:
- *python
- '.flake8'
- 'pyproject.toml'

docs:
- added|modified: './docs/**/*'
- modified: './src/aurora/config/__init__.py'
- modified: './github/workflows/docs.yml'
- modified: './github/file-filters.yml'
23 changes: 0 additions & 23 deletions .github/workflows/docker.yml

This file was deleted.

86 changes: 86 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: "Documentation"

on:
push:
branches:
- develop
- master
schedule:
- cron: '37 23 * * 2'

permissions:
contents: read
pages: write
id-token: write

concurrency:
group: "pages"
cancel-in-progress: false

jobs:
changes:
runs-on: ubuntu-latest
timeout-minutes: 1
defaults:
run:
shell: bash
outputs:
docs: ${{ steps.changed_files.outputs.docs }}
steps:
- name: Checkout code
uses: actions/checkout@v4
- id: changed_files
name: Check for file changes
uses: dorny/paths-filter@v3
with:
base: ${{ github.ref }}
token: ${{ github.token }}
filters: .github/file-filters.yml
generate:
name: Generate
if: needs.changes.outputs.docs == 'true'
needs: changes
runs-on: ubuntu-latest
env:
PYTHONPATH: src/
steps:
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- uses: actions/checkout@v4
- uses: yezz123/setup-uv@v4

- uses: actions/cache/restore@v4
id: restore-cache
with:
path: .venv
key: ${{ runner.os }}-${{ hashFiles('**/uv.lock') }}

- name: Install dependencies
run: uv sync --extra docs

- name: Build Doc
run: .venv/bin/mkdocs build -d ./docs-output

- uses: actions/cache/save@v4
id: cache
if: always() && steps.restore-cache.outputs.cache-hit != 'true'
with:
path: .venv
key: ${{ runner.os }}-${{ hashFiles('**/uv.lock') }}
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: ./docs-output

# Deployment job
deploy:
needs: generate
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
56 changes: 56 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Lint
on:
push:
branches:
- '**'
# pull_request:
# branches: [develop, master]
# types: [synchronize, opened, reopened, ready_for_review]

defaults:
run:
shell: bash


concurrency:
group: "${{ github.workflow }}-${{ github.ref }}"
cancel-in-progress: true


permissions:
contents: read

jobs:
changes:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: check files
runs-on: ubuntu-latest
timeout-minutes: 3
outputs:
lint: ${{ steps.changes.outputs.lint }}
docker: ${{ steps.changes.outputs.docker_base }}
steps:
- run: git config --global --add safe.directory $(realpath .)
- uses: actions/checkout@v4
- id: changes
name: Check for backend file changes
uses: dorny/paths-filter@v3
with:
base: ${{ github.ref }}
token: ${{ github.token }}
filters: .github/file-filters.yml

ruff:
needs: changes
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false && needs.changes.outputs.lint
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install requirements
run: pip install ruff
- name: Check syntax
# Stop the build if there are Python syntax errors or undefined names
run: ruff check -e
79 changes: 79 additions & 0 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Security
on:
push:
branches:
- develop
- master
- staging
- release/*
- feature/*
- bugfix/*
- hotfix/*
# pull_request:
# branches: [develop, master]
# types: [synchronize, opened, reopened, ready_for_review]

defaults:
run:
shell: bash


concurrency:
group: "${{ github.workflow }}-${{ github.ref }}"
cancel-in-progress: true


permissions:
contents: read

jobs:
changes:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: check files
runs-on: ubuntu-latest
timeout-minutes: 3
env:
GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
outputs:
lint: ${{ steps.changes.outputs.lint }}
docker: ${{ steps.changes.outputs.docker_base }}
steps:
- run: git config --global --add safe.directory $(realpath .)
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- id: changes
name: Check for backend file changes
uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
with:
base: ${{ github.ref }}
token: ${{ github.token }}
filters: .github/file-filters.yml

bandit:
needs: changes
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false && needs.changes.outputs.lint
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps:
- uses: actions/checkout@v4
- name: Bandit Scan
uses: shundor/python-bandit-scan@9cc5aa4a006482b8a7f91134412df6772dbda22c
with: # optional arguments
# exit with 0, even with results found
exit_zero: true # optional, default is DEFAULT
# Github token of the repository (automatically created by Github)
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information.
# File or directory to run bandit on
path: src # optional, default is .
# Report only issues of a given severity level or higher. Can be LOW, MEDIUM or HIGH. Default is UNDEFINED (everything)
# level: # optional, default is UNDEFINED
# Report only issues of a given confidence level or higher. Can be LOW, MEDIUM or HIGH. Default is UNDEFINED (everything)
# confidence: # optional, default is UNDEFINED
# comma-separated list of paths (glob patterns supported) to exclude from scan (note that these are in addition to the excluded paths provided in the config file) (default: .svn,CVS,.bzr,.hg,.git,__pycache__,.tox,.eggs,*.egg)
# excluded_paths: # optional, default is DEFAULT
# comma-separated list of test IDs to skip
# skips: # optional, default is DEFAULT
# path to a .bandit file that supplies command line arguments
# ini_path: # optional, default is DEFAULT
Loading
Loading