Skip to content

Commit 786d855

Browse files
committed
make release-tag: Merge branch 'main' into stable
2 parents 04d12d9 + 1636a94 commit 786d855

28 files changed

+826
-469
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Dependency Checker
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 0 * * 1-5'
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
- name: Set up Python 3.9
12+
uses: actions/setup-python@v5
13+
with:
14+
python-version: 3.9
15+
- name: Install dependencies
16+
run: |
17+
python -m pip install .[dev]
18+
make check-deps OUTPUT_FILEPATH=latest_requirements.txt
19+
- name: Create pull request
20+
id: cpr
21+
uses: peter-evans/create-pull-request@v4
22+
with:
23+
token: ${{ secrets.GH_ACCESS_TOKEN }}
24+
commit-message: Update latest dependencies
25+
title: Automated Latest Dependency Updates
26+
body: "This is an auto-generated PR with **latest** dependency updates."
27+
branch: latest-dependency-update
28+
branch-suffix: short-commit-hash
29+
base: main

.github/workflows/integration.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']
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515
steps:
1616
- uses: actions/checkout@v1

.github/workflows/minimum.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']
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515
steps:
1616
- uses: actions/checkout@v1

.github/workflows/readme.yml

Lines changed: 3 additions & 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']
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
1414
os: [ubuntu-latest, macos-latest] # skip windows bc rundoc fails
1515
steps:
1616
- uses: actions/checkout@v1
@@ -22,5 +22,7 @@ jobs:
2222
run: |
2323
python -m pip install --upgrade pip
2424
python -m pip install invoke rundoc .
25+
python -m pip install tomli
26+
python -m pip install packaging
2527
- name: Run the README.md
2628
run: invoke readme
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Static Code Analysis
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
8+
jobs:
9+
code-analysis:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- name: Set up Python 3.10
14+
uses: actions/setup-python@v5
15+
with:
16+
python-version: '3.10'
17+
- name: Install dependencies
18+
run: |
19+
python -m pip install --upgrade pip
20+
python -m pip install bandit==1.7.7
21+
- name: Save code analysis
22+
run: bandit -r . -x ./tests -f txt -o static_code_analysis.txt --exit-zero
23+
- name: Create pull request
24+
id: cpr
25+
uses: peter-evans/create-pull-request@v4
26+
with:
27+
token: ${{ secrets.GH_ACCESS_TOKEN }}
28+
commit-message: Update static code analysis
29+
title: Latest Code Analysis
30+
body: "This is an auto-generated PR with the **latest** code analysis results."
31+
branch: static-code-analysis
32+
branch-suffix: short-commit-hash
33+
base: main

.github/workflows/unit.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']
13+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515
steps:
1616
- uses: actions/checkout@v1

CONTRIBUTING.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,17 +174,17 @@ Release Workflow
174174
The process of releasing a new version involves several steps combining both ``git`` and
175175
``bumpversion`` which, briefly:
176176

177-
1. Merge what is in ``master`` branch into ``stable`` branch.
177+
1. Merge what is in ``main`` branch into ``stable`` branch.
178178
2. Update the version in ``setup.cfg``, ``deepecho/__init__.py`` and
179179
``HISTORY.md`` files.
180180
3. Create a new git tag pointing at the corresponding commit in ``stable`` branch.
181-
4. Merge the new commit from ``stable`` into ``master``.
181+
4. Merge the new commit from ``stable`` into ``main``.
182182
5. Update the version in ``setup.cfg`` and ``deepecho/__init__.py``
183183
to open the next development iteration.
184184

185185
.. note:: Before starting the process, make sure that ``HISTORY.md`` has been updated with a new
186186
entry that explains the changes that will be included in the new version.
187-
Normally this is just a list of the Pull Requests that have been merged to master
187+
Normally this is just a list of the Pull Requests that have been merged to main
188188
since the last release.
189189

190190
Once this is done, run of the following commands:
@@ -219,9 +219,9 @@ This will perform the following actions:
219219
2. Bump the current version to the next release candidate, ``X.Y.Z.dev(N+1)``
220220

221221
After this is done, the new pre-release can be installed by including the ``dev`` section in the
222-
dependency specification, either in ``setup.py``::
222+
dependency specification, either in ``pyproject.toml``::
223223

224-
install_requires = [
224+
dependencies = [
225225
...
226226
'deepecho>=X.Y.Z.dev',
227227
...

HISTORY.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# History
22

3+
## 0.6.0 - 2024-04-10
4+
5+
This release adds support for Python 3.12!
6+
7+
### Maintenance
8+
9+
* Support Python 3.12 - Issue [#85](https://github.com/sdv-dev/DeepEcho/issues/85) by @fealho
10+
* Transition from using setup.py to pyproject.toml to specify project metadata - Issue [#86](https://github.com/sdv-dev/DeepEcho/issues/86) by @R-Palazzo
11+
* Remove bumpversion and use bump-my-version - Issue [#87](https://github.com/sdv-dev/DeepEcho/issues/87) by @R-Palazzo
12+
* Add dependency checker - Issue [#96](https://github.com/sdv-dev/DeepEcho/issues/96) by @lajohn4747
13+
* Add bandit workflow - Issue [#98](https://github.com/sdv-dev/DeepEcho/issues/98) by @R-Palazzo
14+
15+
### Bugs Fixed
16+
17+
* Fix make check candidate - Issue [#91](https://github.com/sdv-dev/DeepEcho/issues/91) by @R-Palazzo
18+
* Fix minimum version workflow when pointing to github branch - Issue [#99](https://github.com/sdv-dev/DeepEcho/issues/99) by @R-Palazzo
19+
20+
## 0.5.0 - 2023-11-13
21+
22+
This release updates the PAR's model progress bar to show loss values and time elapsed (verbose option).
23+
24+
### New Features
25+
* Update progress bar for PAR fitting - Issue [#80](https://github.com/sdv-dev/DeepEcho/issues/80) by @frances-h
26+
27+
328
## 0.4.2 - 2023-07-25
429

530
This release drops support for Python 3.7 and adds support for Python 3.11.

INSTALL.md

Lines changed: 3 additions & 3 deletions
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 and 3.11](https://www.python.org/downloads/)
6+
[Python 3.8, 3.9, 3.10, 3.11 and 3.12](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
@@ -47,12 +47,12 @@ make install
4747

4848
If you intend to modify the source code or contribute to the project you will need to
4949
install it from the source using the `make install-develop` command. In this case, we
50-
recommend you to branch from `master` first:
50+
recommend you to branch from `main` first:
5151

5252
```bash
5353
git clone [email protected]:sdv-dev/DeepEcho
5454
cd DeepEcho
55-
git checkout master
55+
git checkout main
5656
git checkout -b <your-branch-name>
5757
make install-develp
5858
```

MANIFEST.in

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

0 commit comments

Comments
 (0)