Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions .github/workflows/matrix-and-codecov-on-merge-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/tests-on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Restore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libgtk is no longer needed. here, wxpython is install via conda-forge as suggested.

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


Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
]
Expand Down
2 changes: 1 addition & 1 deletion requirements/conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ numpy
diffpy.utils
pandas
scipy
gooey
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed gooey from conda.txt since we won't be able to install it and it will only fail the CI during conda install.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to add wxpython to conda.txt

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, done.

wxpython
Loading