Merge pull request #137 from bobleesj/gooey-ci-build

Support 3.12 CI - conda install `wxPython`, pip install `gooey` - to prevent building `wxPython`

Author: sbillinge

.github/workflows/matrix-and-codecov-on-merge-to-main.yml

@@ -21,9 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-        python-version: ["3.11", "3.12", "3.13"]
+        python-version: ["3.11", "3.12"]
     env:
-          LATEST_PYTHON_VERSION: "3.13"
+          LATEST_PYTHON_VERSION: "3.12"
     steps:
       - name: Check out diffpy.labpdfproc
         uses: actions/checkout@v4
@@ -42,20 +42,11 @@ jobs:
           conda config --set always_yes yes
           --set changeps1 no
 
-      - name: Install diffpy.labpdfproc and requirements for Linux
-        if: runner.os == 'Linux'
+      - name: Install diffpy.labpdfproc and requirements
         run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
           conda install --file requirements/test.txt
-          pip install -r requirements/pip.txt
-          python -m pip install . --no-deps
-
-      - name: Install diffpy.labpdfproc and requirements for non-Linux
-        if: runner.os != 'Linux'
-        run: |
-          conda install --file requirements/test.txt
-          pip install -r requirements/pip.txt
+          conda install --file requirements/conda.txt
+          pip install gooey
           python -m pip install . --no-deps
 
       - name: Validate diffpy.labpdfproc

.github/workflows/tests-on-pr.yml

@@ -25,22 +25,18 @@ jobs:
           auto-update-conda: true
           environment-file: environment.yml
           auto-activate-base: false
-          python-version: 3.13
+          python-version: 3.12
 
       - name: Conda config
         run: >-
           conda config --set always_yes yes
           --set changeps1 no
 
-      - name: Install libgtk for Linux
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev
-
       - name: Install diffpy.labpdfproc and requirements
         run: |
           conda install --file requirements/test.txt
-          pip install -r requirements/pip.txt
+          conda install --file requirements/conda.txt
+          pip install gooey
           python -m pip install . --no-deps
 
 

pyproject.toml

@@ -14,7 +14,7 @@ maintainers = [
 description = "Tools for processing x-ray powder diffraction data from laboratory sources."
 keywords = ['powder xrd', 'absorption correction', 'pdf', 'diffpy']
 readme = "README.rst"
-requires-python = ">=3.11, <3.14"
+requires-python = ">=3.11, <3.13"
 classifiers = [
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
@@ -27,7 +27,6 @@ classifiers = [
         'Operating System :: Unix',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
-        'Programming Language :: Python :: 3.13',
         'Topic :: Scientific/Engineering :: Physics',
         'Topic :: Scientific/Engineering :: Chemistry',
 ]

requirements/conda.txt

@@ -2,4 +2,4 @@ numpy
 diffpy.utils
 pandas
 scipy
-gooey
+wxpython