Merge branch 'develop'

# Conflicts:
#	.github/workflows/test_pyqt5.yml

Author: PierreRaybaut

.github/workflows/build_deploy.yml

@@ -1,7 +1,6 @@
 name: Build and upload to PyPI
 
 on:
-  workflow_dispatch:
   release:
     types:
       - published
@@ -18,8 +17,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install build dependencies (for prebuild)
+        run: |
+          pip install --upgrade pip
+          pip install babel
+
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.21.2
+        env:
+          CIBW_BEFORE_BUILD: pip install babel && pybabel compile -d plotpy/locale -D plotpy
 
       - uses: actions/upload-artifact@v4
         with:
@@ -32,6 +38,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install build dependencies
+        run: |
+          pip install babel
+
+      - name: Compile translations using Babel
+        run: |
+          pybabel compile -d plotpy/locale -D plotpy
+
       - name: Build sdist
         run: pipx run build --sdist
 

.github/workflows/test_pyqt5.yml

@@ -37,10 +37,24 @@ jobs:
         python -m pip install ruff pytest
         pip install PyQt5 setuptools numpy Cython
         python setup.py build_ext --inplace
-        pip install .[test]
         if [ "${{ github.ref_name }}" = "develop" ]; then
-           pip uninstall -y guidata
-           pip install git+https://github.com/PlotPyStack/guidata.git@develop
+           pip uninstall -y guidata PythonQwt
+           cd ..
+           git clone --depth 1 --branch develop https://github.com/PlotPyStack/guidata.git
+           git clone --depth 1 https://github.com/PlotPyStack/PythonQwt.git
+           cd PlotPy
+           pip install -e ../guidata
+           pip install -e ../PythonQwt
+           # Install tomli for TOML parsing (safe if already present)
+           pip install tomli
+           # Extract dependencies and save to file, then install
+           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))"
+           pip install -r deps.txt
+           # Install PlotPy without dependencies
+           pip install --no-deps .
+        else
+           # Install from PyPI normally for main branch
+           pip install .[test]
         fi
     - name: Lint with Ruff
       run: ruff check --output-format=github plotpy

.gitignore

@@ -55,3 +55,5 @@ htmlcov
 # Other
 *.bak
 *_ui.py
+*.mo
+*.pot

.vscode/settings.json

@@ -1,31 +1,32 @@
 {
     "[bat]": {
-        "files.encoding": "cp850",
+        "files.encoding": "cp850"
     },
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    },
+    "[restructuredtext]": {
+        "editor.wordWrap": "on"
+    },
+    "editor.codeActionsOnSave": {
+        "source.organizeImports.ruff": "explicit"
+    },
+    "editor.formatOnSave": true,
     "editor.rulers": [
         88
     ],
     "files.exclude": {
         "**/__pycache__": true,
         "**/*.pyc": true,
         "**/*.pyo": true,
-        "**/*.pyd": true,
+        "**/*.pyd": true
     },
     "files.trimFinalNewlines": true,
     "files.trimTrailingWhitespace": true,
-    "editor.formatOnSave": true,
     "python.analysis.autoFormatStrings": true,
-    "python.testing.unittestEnabled": false,
+    "python.testing.pytestArgs": [],
     "python.testing.pytestEnabled": true,
     "python.testing.pytestPath": "pytest",
-    "python.testing.pytestArgs": [],
-    "[python]": {
-        "editor.defaultFormatter": "charliermarsh.ruff"
-    },
-    "editor.codeActionsOnSave": {
-        "source.organizeImports.ruff": "explicit"
-    },
-    "[restructuredtext]": {
-        "editor.wordWrap": "on"
-    },
+    "python.testing.unittestEnabled": false,
+    "terminal.integrated.tabs.description": "${workspaceFolder}",
 }