Skip to content

Commit c8ae738

Browse files
committed
Use linux CI, install wxpython via conda, use py312
1 parent f6ac225 commit c8ae738

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

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

+3-13
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
24-
python-version: ["3.11", "3.12", "3.13"]
24+
python-version: ["3.11", "3.12"]
2525
env:
26-
LATEST_PYTHON_VERSION: "3.13"
26+
LATEST_PYTHON_VERSION: "3.12"
2727
steps:
2828
- name: Check out diffpy.labpdfproc
2929
uses: actions/checkout@v4
@@ -42,23 +42,13 @@ jobs:
4242
conda config --set always_yes yes
4343
--set changeps1 no
4444
45-
- name: Install diffpy.labpdfproc and requirements for Linux
46-
if: runner.os == 'Linux'
45+
- name: Install diffpy.labpdfproc and requirements
4746
run: |
48-
sudo apt-get update
49-
sudo apt-get install -y libgtk-3-dev
5047
conda install --file requirements/test.txt
5148
conda install --file requirements/conda.txt
5249
pip install gooey
5350
python -m pip install . --no-deps
5451
55-
- name: Install diffpy.labpdfproc and requirements for non-Linux
56-
if: runner.os != 'Linux'
57-
run: |
58-
conda install --file requirements/test.txt
59-
pip install -r requirements/pip.txt
60-
python -m pip install . --no-deps
61-
6252
- name: Validate diffpy.labpdfproc
6353
run: |
6454
pytest --cov

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
run:
1414
shell: bash -l {0}
1515

16-
runs-on: macos-latest
16+
runs-on: ubuntu-latest
1717
steps:
1818
- name: Check out diffpy.labpdfproc repository
1919
uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
2525
auto-update-conda: true
2626
environment-file: environment.yml
2727
auto-activate-base: false
28-
python-version: 3.13
28+
python-version: 3.12
2929

3030
- name: Conda config
3131
run: >-

pyproject.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ maintainers = [
1414
description = "Tools for processing x-ray powder diffraction data from laboratory sources."
1515
keywords = ['powder xrd', 'absorption correction', 'pdf', 'diffpy']
1616
readme = "README.rst"
17-
requires-python = ">=3.11, <3.14"
17+
requires-python = ">=3.11, <3.13"
1818
classifiers = [
1919
'Development Status :: 5 - Production/Stable',
2020
'Environment :: Console',
@@ -27,7 +27,6 @@ classifiers = [
2727
'Operating System :: Unix',
2828
'Programming Language :: Python :: 3.11',
2929
'Programming Language :: Python :: 3.12',
30-
'Programming Language :: Python :: 3.13',
3130
'Topic :: Scientific/Engineering :: Physics',
3231
'Topic :: Scientific/Engineering :: Chemistry',
3332
]

requirements/conda.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ numpy
22
diffpy.utils
33
pandas
44
scipy
5+
wxpython

0 commit comments

Comments
 (0)