Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b7ea3ab
chore: Trigger Git Commit Linter when a draft PR is ready for review
jtrobles-cdd Mar 26, 2025
dd85540
chore: Add GitHub Actions workflow to release and deploy
jtrobles-cdd Mar 26, 2025
54609f9
Merge pull request #790 from cordada/ci-cd-task-release-and-deploy
jtrobles-cdd Mar 26, 2025
c18c644
chore(deps): Bump the development-dependencies group with 5 updates
dependabot[bot] Apr 1, 2025
9eb5cfa
Merge pull request #792 from cordada/dependabot/pip/development-depen…
jtrobles-cdd Apr 2, 2025
5d70460
chore(deps): Bump setuptools from 75.3.0 to 78.1.0
dependabot[bot] Apr 2, 2025
6d7dc9f
Merge pull request #794 from cordada/dependabot/pip/setuptools-78.1.0
jtrobles-cdd Apr 3, 2025
07937d3
chore: Bump the production-dependencies group with 5 updates
dependabot[bot] Apr 2, 2025
4da863c
Merge pull request #797 from cordada/dependabot/github_actions/produc…
acofre-cdd Apr 3, 2025
f2612ef
chore(deps): Bump djangorestframework from 3.15.2 to 3.16.0
dependabot[bot] Apr 4, 2025
238d1f2
Merge pull request #793 from cordada/dependabot/pip/djangorestframewo…
svillegas-cdd Apr 4, 2025
f6cb4dd
chore(deps): Bump pytz from 2025.1 to 2025.2
dependabot[bot] Apr 4, 2025
158f5d5
Merge pull request #795 from cordada/dependabot/pip/pytz-2025.2
svillegas-cdd Apr 7, 2025
1a71733
chore(deps): Bump pydantic from 2.10.6 to 2.11.2
dependabot[bot] Apr 7, 2025
f0559a1
Merge pull request #796 from cordada/dependabot/pip/pydantic-2.11.1
svillegas-cdd Apr 7, 2025
76cf838
chore: Bump the production-dependencies group with 3 updates
dependabot[bot] May 1, 2025
f9e3555
Merge pull request #798 from cordada/dependabot/github_actions/produc…
svillegas-cdd May 6, 2025
1acd135
chore: Bump django from 4.2.20 to 4.2.21
dependabot[bot] May 8, 2025
127a64a
Merge pull request #804 from cordada/dependabot/pip/django-4.2.21
jtrobles-cdd May 15, 2025
f8e4dcb
chore: Bump setuptools from 78.1.0 to 78.1.1
dependabot[bot] May 20, 2025
6c7158d
Merge pull request #805 from cordada/dependabot/pip/setuptools-78.1.1
jtrobles-cdd May 20, 2025
de0dca0
chore(deps): Bump importlib-metadata from 8.6.1 to 8.7.0
dependabot[bot] May 20, 2025
047552b
Merge pull request #802 from cordada/dependabot/pip/importlib-metadat…
jtrobles-cdd May 20, 2025
d677aec
chore(deps): Bump djangorestframework from 3.15.2 to 3.16.0
dependabot[bot] May 20, 2025
ae5c4f2
Merge pull request #799 from cordada/dependabot/pip/djangorestframewo…
jtrobles-cdd May 22, 2025
117033d
chore(deps): Bump lxml from 5.3.1 to 5.4.0
dependabot[bot] May 20, 2025
37099e9
Merge pull request #803 from cordada/dependabot/pip/lxml-5.4.0
jtrobles-cdd May 22, 2025
dce36db
chore(deps): Uninstall Python package `types-pyOpenSSL`
jtrobles-cdd May 22, 2025
e75e454
chore(deps): Install Python package `types-setuptools`
jtrobles-cdd May 22, 2025
4241a70
Merge pull request #806 from cordada/uninstall-types-pyopenssl
jtrobles-cdd May 22, 2025
be595fb
chore(deps): Bump cryptography from 44.0.1 to 44.0.3
dependabot[bot] May 15, 2025
cd8bcde
Merge pull request #801 from cordada/dependabot/pip/cryptography-44.0.2
jtrobles-cdd May 22, 2025
b9b148e
chore: Update history for new version
jtrobles-cdd May 22, 2025
8e1df76
chore: Bump version from 0.45.0 to 0.46.0
jtrobles-cdd May 22, 2025
3c36be3
Merge pull request #807 from cordada/release/v0.46.0
jtrobles-cdd May 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.45.0
current_version = 0.46.0
commit = True
tag = False
message = chore: Bump version from {current_version} to {new_version}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

- name: Set Up Python ${{ matrix.python_version }}
id: set_up_python
uses: actions/setup-python@v5.4.0
uses: actions/setup-python@v5.6.0
with:
python-version: "${{ matrix.python_version }}"
check-latest: true
Expand All @@ -46,7 +46,7 @@
run: make python-virtualenv PYTHON_VIRTUALENV_DIR="venv"

- name: Restoring/Saving Cache
uses: actions/cache@v4.2.2
uses: actions/cache@v4.2.3
with:
path: |
.tox
Expand Down Expand Up @@ -81,13 +81,13 @@

- name: Set Up Python ${{ matrix.python_version }}
id: set_up_python
uses: actions/setup-python@v5.4.0
uses: actions/setup-python@v5.6.0
with:
python-version: "${{ matrix.python_version }}"
check-latest: true

- name: Restoring/Saving Cache
uses: actions/cache@v4.2.2
uses: actions/cache@v4.2.3
with:
path: |
.tox
Expand Down Expand Up @@ -128,7 +128,7 @@
make test-coverage-report
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5.4.0
uses: codecov/codecov-action@v5.4.2

Check warning

Code scanning / CodeQL

Unpinned tag for a non-immutable Action in workflow Medium

Unpinned 3rd party Action 'CI' step
Uses Step
uses 'codecov/codecov-action' with ref 'v5.4.2', not a pinned commit hash
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./test-reports/coverage/
Expand All @@ -143,7 +143,7 @@
- name: Store Artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4.6.1
uses: actions/upload-artifact@v4.6.2
with:
name: test_reports_${{ matrix.python_version }}
path: test-reports/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
uses: actions/checkout@v4.2.2

- name: Dependency Review
uses: actions/dependency-review-action@v4.5.0
uses: actions/dependency-review-action@v4.6.0
with:
fail-on-severity: critical
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ jobs:

- name: Set Up Python
id: set_up_python
uses: actions/setup-python@v5.4.0
uses: actions/setup-python@v5.6.0
with:
python-version: "3.10"

- name: Restoring/Saving Cache
uses: actions/cache@v4.2.2
uses: actions/cache@v4.2.3
with:
path: "venv"
key: py-v1-deps-${{ runner.os }}-${{ steps.set_up_python.outputs.python-version }}-${{ hashFiles('pyproject.toml', 'requirements.txt', 'requirements-dev.txt', 'Makefile', 'make/**.mk') }}

- name: Restore Artifacts (Release)
uses: actions/download-artifact@v4.1.9
uses: actions/download-artifact@v4.3.0
with:
name: release
path: ${{ inputs.artifacts_path }}/
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/git-commit-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- opened
- reopened
- synchronize
- ready_for_review

permissions:
contents: read
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:

- name: Set Up Python
id: set_up_python
uses: actions/setup-python@v5.4.0
uses: actions/setup-python@v5.6.0
with:
python-version: "3.10"

- name: Create Python Virtual Environment
run: make python-virtualenv PYTHON_VIRTUALENV_DIR="venv"

- name: Restoring/Saving Cache
uses: actions/cache@v4.2.2
uses: actions/cache@v4.2.3
with:
path: "venv"
key: py-v1-deps-${{ runner.os }}-${{ steps.set_up_python.outputs.python-version }}-${{ hashFiles('pyproject.toml', 'requirements.txt', 'requirements-dev.txt', 'Makefile', 'make/**.mk') }}
Expand All @@ -68,7 +68,7 @@ jobs:
make dist

- name: Store Artifacts
uses: actions/upload-artifact@v4.6.1
uses: actions/upload-artifact@v4.6.2
with:
name: release
path: ${{ env.ARTIFACTS_PATH }}/
Expand Down
75 changes: 75 additions & 0 deletions .github/workflows/task-release-and-deploy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# GitHub Actions Workflow for 'Release and Deploy' Task

name: "Task: Release and Deploy"

on:
pull_request:
types:
- closed
branches: # Base reference
- develop

permissions: {}

jobs:
deploy:
name: Deploy
if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') }}
runs-on: ubuntu-22.04

permissions:
contents: write
pull-requests: write

env:
CREATE_RELEASE_VCS_REVISION_ID: ${{ github.sha }} # Merge commit in base branch.
PREPARE_RELEASE_GITHUB_PULL_REQUEST_HTML_URL: ${{ github.event.pull_request.html_url }}
PREPARE_RELEASE_GITHUB_PULL_REQUEST_TITLE: ${{ github.event.pull_request.title }}
PREPARE_RELEASE_GITHUB_VCS_REF: ${{ github.event.pull_request.head.ref }}
RELEASE_ASSIGNEE: ${{ github.event.pull_request.assignee.login }}
RELEASE_VCS_REF: refs/heads/master

steps:
- name: Check Out VCS Repository
uses: actions/checkout@v4.2.2
with:
ref: ${{ env.CREATE_RELEASE_VCS_REVISION_ID }}

- name: Prepare Git
run: |
echo 'Adding Git aliases…'
git config alias.publish \
'push --set-upstream origin HEAD'
- name: Prepare Pull Request for Deployment
run: |
create_release_vcs_branch_name="${PREPARE_RELEASE_GITHUB_VCS_REF:?}"
create_release_vcs_branch_name="${create_release_vcs_branch_name/release/deploy}"
echo "Creating release creation VCS branch '$create_release_vcs_branch_name'…"
git checkout -b "${create_release_vcs_branch_name:?}" --
git publish --verbose
create_release_vcs_ref="refs/heads/${create_release_vcs_branch_name:?}"
echo "CREATE_RELEASE_VCS_REF=${create_release_vcs_ref:?}" >> "$GITHUB_ENV"
create_release_github_pull_request_title="${PREPARE_RELEASE_GITHUB_PULL_REQUEST_TITLE:?}"
create_release_github_pull_request_title="deploy ${create_release_github_pull_request_title,,}"
create_release_github_pull_request_title="${create_release_github_pull_request_title@u}"
echo "CREATE_RELEASE_GITHUB_PULL_REQUEST_TITLE=${create_release_github_pull_request_title:?}" >> "$GITHUB_ENV"
create_release_github_pull_request_description="Ref: ${PREPARE_RELEASE_GITHUB_PULL_REQUEST_HTML_URL:?}"
echo "CREATE_RELEASE_GITHUB_PULL_REQUEST_DESCRIPTION=${create_release_github_pull_request_description:?}" >> "$GITHUB_ENV"
Comment on lines +45 to +61

Check warning

Code scanning / CodeQL

Environment variable built from user-controlled sources Medium

Potential environment variable injection in [create_release_vcs_branch_name="${PREPARE_RELEASE_GITHUB_VCS_REF:?}"
create_release_vcs_branch_name="${create_release_vcs_branch_name/release/deploy}"
echo "Creating release creation VCS branch '$create_release_vcs_branch_name'…"
git checkout -b "${create_release_vcs_branch_name:?}" --
git publish --verbose create_release_vcs_ref="refs/heads/${create_release_vcs_branch_name:?}"
echo "CREATE_RELEASE_VCS_REF=${create_release_vcs_ref:?}" >> "$GITHUB_ENV" create_release_github_pull_request_title="${PREPARE_RELEASE_GITHUB_PULL_REQUEST_TITLE:?}"
create_release_github_pull_request_title="deploy ${create_release_github_pull_request_title,,}"
create_release_github_pull_request_title="${create_release_github_pull_request_title@u}"
echo "CREATE_RELEASE_GITHUB_PULL_REQUEST_TITLE=${create_release_github_pull_request_title:?}" >> "$GITHUB_ENV" create_release_github_pull_request_description="Ref: ${PREPARE_RELEASE_GITHUB_PULL_REQUEST_HTML_URL:?}"
echo "CREATE_RELEASE_GITHUB_PULL_REQUEST_DESCRIPTION=${create_release_github_pull_request_description:?}" >> "$GITHUB_ENV"](1), which may be controlled by an external user.
- name: Create GitHub Pull Request for Deployment
run: |
gh pr create \
--base "$RELEASE_VCS_REF" \
--head "$CREATE_RELEASE_VCS_REF" \
--draft \
--title "$CREATE_RELEASE_GITHUB_PULL_REQUEST_TITLE" \
--body "$CREATE_RELEASE_GITHUB_PULL_REQUEST_DESCRIPTION" \
--assignee "$RELEASE_ASSIGNEE" \
--label 'task' \
--label 'kind: deploy'
env:
GH_TOKEN: ${{ github.token }}
18 changes: 18 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# History

## 0.46.0 (2025-05-22)

- (PR #790, 2025-03-26) Add GitHub Actions workflow to release and deploy; Etc.
- (PR #792, 2025-04-02) deps: Bump the development-dependencies group with 5 updates
- (PR #794, 2025-04-02) chore(deps): Bump setuptools from 75.3.0 to 78.1.0
- (PR #797, 2025-04-03) chore: Bump the production-dependencies group with 5 updates
- (PR #793, 2025-04-04) chore(deps): Bump djangorestframework from 3.15.2 to 3.16.0
- (PR #795, 2025-04-07) chore(deps): Bump pytz from 2025.1 to 2025.2
- (PR #796, 2025-04-07) chore(deps): Bump pydantic from 2.10.6 to 2.11.2
- (PR #798, 2025-05-06) chore: Bump the production-dependencies group with 3 updates
- (PR #804, 2025-05-14) chore: Bump django from 4.2.20 to 4.2.21
- (PR #805, 2025-05-19) chore: Bump setuptools from 78.1.0 to 78.1.1
- (PR #802, 2025-05-19) chore(deps): Bump importlib-metadata from 8.6.1 to 8.7.0
- (PR #799, 2025-05-22) chore(deps): Bump djangorestframework from 3.15.2 to 3.16.0
- (PR #803, 2025-05-22) chore(deps): Bump lxml from 5.3.1 to 5.4.0
- (PR #806, 2025-05-22) deps: Uninstall Python package `types-pyOpenSSL`
- (PR #801, 2025-05-22) chore(deps): Bump cryptography from 44.0.1 to 44.0.3

## 0.45.0 (2025-03-24)

- (PR #784, 2025-03-13) chore(deps): Bump the development-dependencies group with 8 updates
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

[build-system]
requires = [
"setuptools==75.3.0",
"setuptools==78.1.1",
"wheel==0.45.1",
]
build-backend = "setuptools.build_meta"
Expand Down Expand Up @@ -51,7 +51,7 @@ dynamic = ["version"]
[project.optional-dependencies]
django = ["Django>=4.2"]
django-filter = ["django-filter>=24.2"]
djangorestframework = ["djangorestframework>=3.10.3,<3.16"]
djangorestframework = ["djangorestframework>=3.10.3,<3.17"]
pydantic = ["pydantic>=2.0"]

[project.urls]
Expand Down
12 changes: 6 additions & 6 deletions requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
black==25.1.0
build==1.2.2.post1
bumpversion==0.5.3
coverage==7.6.12
flake8==7.1.2
coverage==7.8.0
flake8==7.2.0
isort==6.0.1
mypy==1.15.0
pip-tools==7.4.1
tox==4.24.2
tox==4.25.0
twine==6.1.0
types-jsonschema==4.23.0.20241208
types-lxml==2025.3.4
types-pyOpenSSL==24.1.0.20240722
types-pytz==2025.1.0.20250204
types-lxml==2025.3.30
types-pytz==2025.2.0.20250326
types-setuptools==78.1.0.20250329
wheel==0.45.1
31 changes: 14 additions & 17 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@ click==8.0.3
# pip-tools
colorama==0.4.6
# via tox
coverage==7.6.12
coverage==7.8.0
# via -r requirements-dev.in
cryptography==44.0.1
cryptography==44.0.3
# via
# -c requirements.txt
# secretstorage
# types-pyopenssl
cssselect==1.2.0
# via types-lxml
distlib==0.3.7
Expand All @@ -57,13 +56,13 @@ filelock==3.16.1
# via
# tox
# virtualenv
flake8==7.1.2
flake8==7.2.0
# via -r requirements-dev.in
id==1.5.0
# via twine
idna==3.7
# via requests
importlib-metadata==8.6.1
importlib-metadata==8.7.0
# via
# -c requirements.txt
# build
Expand Down Expand Up @@ -107,13 +106,13 @@ platformdirs==4.3.6
# virtualenv
pluggy==1.5.0
# via tox
pycodestyle==2.12.0
pycodestyle==2.13.0
# via flake8
pycparser==2.22
# via
# -c requirements.txt
# cffi
pyflakes==3.2.0
pyflakes==3.3.2
# via flake8
pygments==2.15.0
# via
Expand Down Expand Up @@ -161,24 +160,20 @@ tomli==2.2.1
# pyproject-api
# pyproject-hooks
# tox
tox==4.24.2
tox==4.25.0
# via -r requirements-dev.in
twine==6.1.0
# via -r requirements-dev.in
types-cffi==1.16.0.20240331
# via types-pyopenssl
types-html5lib==1.1.11.20241018
# via types-lxml
types-jsonschema==4.23.0.20241208
# via -r requirements-dev.in
types-lxml==2025.3.4
types-lxml==2025.3.30
# via -r requirements-dev.in
types-pyopenssl==24.1.0.20240722
types-pytz==2025.2.0.20250326
# via -r requirements-dev.in
types-pytz==2025.1.0.20250204
types-setuptools==78.1.0.20250329
# via -r requirements-dev.in
types-setuptools==75.3.0.20241112
# via types-cffi
typing-extensions==4.12.2
# via
# -c requirements.txt
Expand Down Expand Up @@ -207,5 +202,7 @@ zipp==3.20.2
# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via pip-tools
setuptools==75.3.0
# via pip-tools
setuptools==78.1.1
# via
# pip-tools
# types-setuptools
12 changes: 6 additions & 6 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
# git+https://github.com/example/example.git@example-vcs-ref#egg=example-pkg[foo,bar]==1.42.3

backports-zoneinfo==0.2.1 ; python_version < "3.9" # Used by `djangorestframework`.
cryptography==44.0.1
cryptography==44.0.3
defusedxml==0.7.1
django-filter>=24.2
Django>=4.2
djangorestframework>=3.10.3,<3.16
importlib-metadata==8.6.1
djangorestframework>=3.10.3,<3.17
importlib-metadata==8.7.0
jsonschema==4.23.0
lxml==5.3.1
lxml==5.4.0
marshmallow==3.26.1
pydantic==2.10.6
pydantic==2.11.2
pyOpenSSL==25.0.0
pytz==2025.1
pytz==2025.2
signxml==4.0.3
typing-extensions==4.12.2
Loading