Skip to content

Commit a71744a

Browse files
committed
make release-tag: Merge branch 'main' into stable
2 parents 6a6ea32 + abc448b commit a71744a

22 files changed

+144
-119
lines changed

.github/workflows/dependency_checker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
run: |
1717
python -m pip install .[dev]
1818
make check-deps OUTPUT_FILEPATH=latest_requirements.txt
19+
make fix-lint
1920
- name: Create pull request
2021
id: cpr
2122
uses: peter-evans/create-pull-request@v4

.github/workflows/integration.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
1414
os: [ubuntu-latest, windows-latest]
1515
include:
1616
- os: macos-latest
1717
python-version: '3.8'
1818
- os: macos-latest
19-
python-version: '3.12'
19+
python-version: '3.13'
2020
steps:
2121
- uses: actions/checkout@v1
2222
- name: Set up Python ${{ matrix.python-version }}
@@ -29,6 +29,11 @@ jobs:
2929
python -m pip install invoke .[test]
3030
- name: Run integration tests
3131
run: invoke integration
32-
- if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.8
33-
name: Upload codecov report
34-
uses: codecov/codecov-action@v2
32+
33+
- if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
34+
name: Upload integration codecov report
35+
uses: codecov/codecov-action@v4
36+
with:
37+
flags: integration
38+
file: ${{ github.workspace }}/integration_cov.xml
39+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/minimum.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
14+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
1515
os: [ubuntu-latest, windows-latest]
1616
include:
1717
- os: macos-13
1818
python-version: '3.8'
1919
- os: macos-latest
20-
python-version: '3.12'
20+
python-version: '3.13'
2121
steps:
2222
- uses: actions/checkout@v4
2323
- name: Set up Python ${{ matrix.python-version }}
Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Release Notes Generator
1+
name: Release Prep
22

33
on:
44
workflow_dispatch:
55
inputs:
66
branch:
7-
description: 'Branch to merge release notes into.'
7+
description: 'Branch to merge release notes and code analysis into.'
88
required: true
99
default: 'main'
1010
version:
@@ -15,7 +15,7 @@ on:
1515
'Date of the release. Must be in format YYYY-MM-DD.'
1616

1717
jobs:
18-
releasenotesgeneration:
18+
preparerelease:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@v4
@@ -28,6 +28,8 @@ jobs:
2828
run: |
2929
python -m pip install --upgrade pip
3030
python -m pip install requests==2.31.0
31+
python -m pip install bandit==1.7.7
32+
python -m pip install .[test]
3133
3234
- name: Generate release notes
3335
env:
@@ -37,16 +39,19 @@ jobs:
3739
-v ${{ inputs.version }}
3840
-d ${{ inputs.date }}
3941
42+
- name: Save static code analysis
43+
run: bandit -r . -x ./tests,./scripts,./build -f txt -o static_code_analysis.txt --exit-zero
44+
4045
- name: Create pull request
4146
id: cpr
4247
uses: peter-evans/create-pull-request@v4
4348
with:
4449
token: ${{ secrets.GH_ACCESS_TOKEN }}
45-
commit-message: Release notes for v${{ inputs.version }}
50+
commit-message: Prepare release for v${{ inputs.version }}
4651
author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
4752
committer: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
48-
title: v${{ inputs.version }} Release Notes
49-
body: "This is an auto-generated PR to update the release notes."
50-
branch: release-notes
53+
title: v${{ inputs.version }} Release Preparation
54+
body: "This is an auto-generated PR to prepare the release."
55+
branch: prepared-release
5156
branch-suffix: short-commit-hash
5257
base: ${{ inputs.branch }}

.github/workflows/readme.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
1414
os: [ubuntu-latest, macos-latest] # skip windows bc rundoc fails
1515
steps:
1616
- uses: actions/checkout@v1

.github/workflows/static_code_analysis.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/unit.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
1414
os: [ubuntu-latest, windows-latest]
1515
include:
1616
- os: macos-latest
1717
python-version: '3.8'
1818
- os: macos-latest
19-
python-version: '3.12'
19+
python-version: '3.13'
2020
steps:
2121
- uses: actions/checkout@v1
2222
- name: Set up Python ${{ matrix.python-version }}
@@ -29,3 +29,11 @@ jobs:
2929
python -m pip install invoke .[test]
3030
- name: Run unit tests
3131
run: invoke unit
32+
33+
- if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.13
34+
name: Upload unit codecov report
35+
uses: codecov/codecov-action@v4
36+
with:
37+
flags: unit
38+
file: ${{ github.workspace }}/unit_cov.xml
39+
token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ coverage.xml
4646
*.cover
4747
.hypothesis/
4848
.pytest_cache/
49+
*_cov.xml
4950

5051
# Translations
5152
*.mo

HISTORY.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# History
22

3-
### v0.6.1 - 2024-10-22
3+
### v0.7.0 - 2025-02-13
4+
5+
### Maintenance
6+
7+
* Combine `static_code_analysis.yml` with `release_notes.yml` - Issue [#142](https://github.com/sdv-dev/DeepEcho/issues/142) by @R-Palazzo
8+
* Support Python 3.13 - Issue [#136](https://github.com/sdv-dev/DeepEcho/issues/136) by @rwedge
9+
* Update codecov and add flag for integration tests - Issue [#135](https://github.com/sdv-dev/DeepEcho/issues/135) by @pvk-developer
10+
11+
## v0.6.1 - 2024-10-22
412

513
### Bugs Fixed
614

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Requirements
44

55
**DeepEcho** has been developed and tested on
6-
[Python 3.8, 3.9, 3.10, 3.11 and 3.12](https://www.python.org/downloads/)
6+
[Python 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13](https://www.python.org/downloads/)
77

88
Also, although it is not strictly required, the usage of a [virtualenv](
99
https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid

0 commit comments

Comments
 (0)