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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd1cc82
Remove gooey in conda.txt and install gooey via pip in CI
bobleesj Nov 27, 2024
e09f123
Use macos to install wxpython from pip instead of linux CI
bobleesj Nov 27, 2024
f6ac225
Remove Install libgtk
bobleesj Nov 27, 2024
c8ae738
Use linux CI, install wxpython via conda, use py312
bobleesj Dec 2, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/matrix-and-codecov-on-merge-to-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ jobs:
sudo apt-get update
sudo apt-get install -y libgtk-3-dev
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: Install diffpy.labpdfproc and requirements for non-Linux
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/tests-on-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
run:
shell: bash -l {0}

runs-on: ubuntu-latest
runs-on: macos-latest
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It turns out wxpython needs to be built for linux since no native whl is provided while we have windows/macos whl files provided shown below:

Screenshot 2024-11-27 at 4 03 15 PM

Since @yucongalicechen and I test using macOS, what if we setup a MacOS CI instead?

Ref:
https://pypi.org/project/wxPython/#files

Copy link
Contributor

Choose a reason for hiding this comment

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

Move back to Linux after we add wxpython to conda.txt

steps:
- name: Check out diffpy.labpdfproc repository
uses: actions/checkout@v4
Expand All @@ -32,15 +32,11 @@ jobs:
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
1 change: 0 additions & 1 deletion requirements/conda.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ 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.

Loading