Skip to content

Commit 2849db5

Browse files
committed
Merge branch 'develop'
# Conflicts: # .github/workflows/test_pyqt5.yml
2 parents e5edf17 + 4f06ff6 commit 2849db5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+3487
-2382
lines changed

.github/workflows/build_deploy.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Build and upload to PyPI
22

33
on:
4-
workflow_dispatch:
54
release:
65
types:
76
- published
@@ -18,8 +17,15 @@ jobs:
1817
steps:
1918
- uses: actions/checkout@v4
2019

20+
- name: Install build dependencies (for prebuild)
21+
run: |
22+
pip install --upgrade pip
23+
pip install babel
24+
2125
- name: Build wheels
2226
uses: pypa/[email protected]
27+
env:
28+
CIBW_BEFORE_BUILD: pip install babel && pybabel compile -d plotpy/locale -D plotpy
2329

2430
- uses: actions/upload-artifact@v4
2531
with:
@@ -32,6 +38,14 @@ jobs:
3238
steps:
3339
- uses: actions/checkout@v4
3440

41+
- name: Install build dependencies
42+
run: |
43+
pip install babel
44+
45+
- name: Compile translations using Babel
46+
run: |
47+
pybabel compile -d plotpy/locale -D plotpy
48+
3549
- name: Build sdist
3650
run: pipx run build --sdist
3751

.github/workflows/test_pyqt5.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,24 @@ jobs:
3737
python -m pip install ruff pytest
3838
pip install PyQt5 setuptools numpy Cython
3939
python setup.py build_ext --inplace
40-
pip install .[test]
4140
if [ "${{ github.ref_name }}" = "develop" ]; then
42-
pip uninstall -y guidata
43-
pip install git+https://github.com/PlotPyStack/guidata.git@develop
41+
pip uninstall -y guidata PythonQwt
42+
cd ..
43+
git clone --depth 1 --branch develop https://github.com/PlotPyStack/guidata.git
44+
git clone --depth 1 https://github.com/PlotPyStack/PythonQwt.git
45+
cd PlotPy
46+
pip install -e ../guidata
47+
pip install -e ../PythonQwt
48+
# Install tomli for TOML parsing (safe if already present)
49+
pip install tomli
50+
# Extract dependencies and save to file, then install
51+
python -c "import tomli; f=open('pyproject.toml','rb'); data=tomli.load(f); deps=[d for d in data['project']['dependencies'] if not any(p in d for p in ['guidata', 'PythonQwt'])]; open('deps.txt','w').write('\n'.join(deps))"
52+
pip install -r deps.txt
53+
# Install PlotPy without dependencies
54+
pip install --no-deps .
55+
else
56+
# Install from PyPI normally for main branch
57+
pip install .[test]
4458
fi
4559
- name: Lint with Ruff
4660
run: ruff check --output-format=github plotpy

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ htmlcov
5555
# Other
5656
*.bak
5757
*_ui.py
58+
*.mo
59+
*.pot

.vscode/settings.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
{
22
"[bat]": {
3-
"files.encoding": "cp850",
3+
"files.encoding": "cp850"
44
},
5+
"[python]": {
6+
"editor.defaultFormatter": "charliermarsh.ruff"
7+
},
8+
"[restructuredtext]": {
9+
"editor.wordWrap": "on"
10+
},
11+
"editor.codeActionsOnSave": {
12+
"source.organizeImports.ruff": "explicit"
13+
},
14+
"editor.formatOnSave": true,
515
"editor.rulers": [
616
88
717
],
818
"files.exclude": {
919
"**/__pycache__": true,
1020
"**/*.pyc": true,
1121
"**/*.pyo": true,
12-
"**/*.pyd": true,
22+
"**/*.pyd": true
1323
},
1424
"files.trimFinalNewlines": true,
1525
"files.trimTrailingWhitespace": true,
16-
"editor.formatOnSave": true,
1726
"python.analysis.autoFormatStrings": true,
18-
"python.testing.unittestEnabled": false,
27+
"python.testing.pytestArgs": [],
1928
"python.testing.pytestEnabled": true,
2029
"python.testing.pytestPath": "pytest",
21-
"python.testing.pytestArgs": [],
22-
"[python]": {
23-
"editor.defaultFormatter": "charliermarsh.ruff"
24-
},
25-
"editor.codeActionsOnSave": {
26-
"source.organizeImports.ruff": "explicit"
27-
},
28-
"[restructuredtext]": {
29-
"editor.wordWrap": "on"
30-
},
30+
"python.testing.unittestEnabled": false,
31+
"terminal.integrated.tabs.description": "${workspaceFolder}",
3132
}

0 commit comments

Comments
 (0)