Skip to content

Commit 1b933da

Browse files
authored
Merge pull request #9 from semuadmin/RC-1.0.16
RC 1.0.16
2 parents 39bced0 + 8e60d41 commit 1b933da

File tree

13 files changed

+119
-733
lines changed

13 files changed

+119
-733
lines changed

.github/workflows/deploy.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: deploy
2+
3+
on:
4+
release: # when new release created
5+
types: [published]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
release-build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
15+
- uses: actions/checkout@v4
16+
- name: Set up Python
17+
uses: actions/setup-python@v5
18+
with:
19+
python-version: 3.13
20+
21+
- name: Build release distributions
22+
run: |
23+
python -m pip install build
24+
python -m build
25+
26+
- name: Upload distributions # upload build artifacts
27+
uses: actions/upload-artifact@v4
28+
with:
29+
name: release-dists
30+
path: dist/
31+
32+
release-publish:
33+
needs:
34+
- release-build
35+
name: Upload release to PyPI
36+
runs-on: ubuntu-latest
37+
environment:
38+
name: pypi
39+
permissions:
40+
id-token: write
41+
steps:
42+
43+
- name: Download all the dists # download build artifacts saved in previous job
44+
uses: actions/download-artifact@v4
45+
with:
46+
name: release-dists
47+
path: dist/
48+
49+
- name: Publish package distributions to PyPI
50+
uses: pypa/gh-action-pypi-publish@release/v1

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"python.testing.pytestEnabled": true,
33
"python.testing.unittestEnabled": false,
44
"python.formatting.provider": "black",
5-
"python.defaultInterpreterPath": "python3",
5+
"python.defaultInterpreterPath": "/Users/steve/pymandel/bin/python3.13",
66
"editor.formatOnSave": true,
77
"modulename": "pymandel",
88
"distname": "pymandel",

.vscode/tasks.json

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,14 @@
3030
"${config:modulename}.egg-info",
3131
],
3232
"windows": {
33-
"command": "Get-ChildItem",
33+
"command": "rm",
3434
"args": [
35+
"-R",
3536
"-Path",
36-
"build\\,",
37-
"dist\\,",
38-
"htmlcov\\,",
39-
"docs\\_build,",
40-
"${config:modulename}.egg-info",
41-
"-Recurse",
42-
"|",
43-
"Remove-Item",
44-
"-Recurse",
45-
"-Confirm:$false",
46-
"-Force",
47-
],
37+
"'src/${config:modulename}.egg-info','build','dist','htmlcov','docs/_build'",
38+
"-ErrorAction",
39+
"SilentlyContinue" // doesn't work! - stops on exit code 1 anyway
40+
]
4841
},
4942
"options": {
5043
"cwd": "${workspaceFolder}"
@@ -111,7 +104,20 @@
111104
"--wheel",
112105
"--sdist",
113106
],
114-
"problemMatcher": []
107+
"problemMatcher": [],
108+
"dependsOrder": "sequence",
109+
"dependsOn": [
110+
"Clean",
111+
"Security",
112+
"Sort Imports",
113+
"Format",
114+
"Pylint",
115+
"Test",
116+
],
117+
"group": {
118+
"kind": "build",
119+
"isDefault": true
120+
}
115121
},
116122
{
117123
"label": "Test",
@@ -176,31 +182,27 @@
176182
},
177183
{
178184
"label": "Install Locally",
179-
"type": "shell",
185+
"type": "process",
180186
"command": "${config:python.defaultInterpreterPath}",
181187
"args": [
182188
"-m",
183189
"pip",
184190
"install",
185-
"--user",
191+
"--upgrade",
186192
"--force-reinstall",
187-
"*.whl"
193+
"--find-links=${workspaceFolder}/dist",
194+
"${workspaceFolderBasename}",
195+
// "--target",
196+
// "${config:venv}/Lib/site-packages"
188197
],
198+
"options": {
199+
"cwd": "dist"
200+
},
189201
"dependsOrder": "sequence",
190202
"dependsOn": [
191-
"Clean",
192-
"Install Dependencies",
193-
"Security",
194-
"Sort Imports",
195-
"Format",
196-
"Pylint",
197-
"Test",
198203
"Build",
199204
"Sphinx HTML"
200205
],
201-
"options": {
202-
"cwd": "dist"
203-
},
204206
"problemMatcher": []
205207
},
206208
]

RELEASE_NOTES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# PyMandel Release Notes
22

3+
### RELEASE 1.0.16
4+
5+
FIXES:
6+
7+
1. Remove deprecated tkinter trace calls in settings_frame.py. Now supports tkinter 9.0.2 under Python 3.12 and 3.13.
8+
1. Remove deprecated entries in pyproject.toml.
9+
310
### RELEASE 1.0.15
411

512
CHANGES:

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ build-backend = "setuptools.build_meta:__legacy__"
55
[project]
66
name = "pymandel"
77
dynamic = ["version"]
8-
authors = [{ name = "semuadmin", email = "[email protected]" }]
9-
maintainers = [{ name = "semuadmin", email = "[email protected]" }]
8+
authors = [{ name = "Steve Smith", email = "[email protected]" }]
9+
maintainers = [{ name = "Steve Smith", email = "[email protected]" }]
1010
description = "Fractal generation GUI application"
11-
license = { file = "LICENSE" }
11+
license = "GPL-3.0-only"
12+
license-files = ["LICENSE"]
1213
keywords = [
1314
"PyMandel",
1415
"fractal",
@@ -34,7 +35,6 @@ classifiers = [
3435
"Programming Language :: Python :: 3.11",
3536
"Programming Language :: Python :: 3.12",
3637
"Programming Language :: Python :: 3.13",
37-
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
3838
"Topic :: Multimedia :: Graphics",
3939
"Topic :: Scientific/Engineering :: Mathematics",
4040
"Topic :: Education",

0 commit comments

Comments
 (0)