Skip to content
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

Jump to bottom

WIP: modernise package data and fix CI #36

Merged
merged 4 commits into from
Sep 19, 2024
Merged

WIP: modernise package data and fix CI #36

merged 4 commits into from
Sep 19, 2024

Conversation

jni
Copy link
Member

@jni jni commented Sep 19, 2024 •
edited
Loading

  • Update all actions versions in test_and_deploy gha
  • replace setup.cfg with pyproject.toml
  • Update supported Python versions in tox.ini
  • Update tox.ini to use pyside only on py39

@jni
Update all actions versions in test_and_deploy gha
ec2b6a9
@jni
replace setup.cfg with pyproject.toml
fa765ad 
Also:
- update author to napari team
- update supported Python versions
- add optional dependencies
@jni
Update supported Python versions in tox.ini
4b27217
@jni
Copy link
Member Author

jni commented Sep 19, 2024

So I don't understand why tox doesn't install pyqt etc, given this line. @Czaki I think you were trying to explain what was wrong to me at eurasia meeting yesterday but I didn't quite grok it. Can you tell me what needs changing here? 🙏

@Czaki
Copy link
Contributor

Czaki commented Sep 19, 2024

PySide2 support python up to python 3.10, and we made pyside2 conditional dependency here https://github.com/napari/napari/blob/e8c41abf306e45dc06f8569f6bdd461386f15e92/pyproject.toml#L95

@jni
Copy link
Member Author

jni commented Sep 19, 2024

Ah. So what do you think about only testing pyqt in this repo?

Czaki
Czaki reviewed Sep 19, 2024
View reviewed changes
tox.ini Outdated
@@ -1,14 +1,13 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39,310}-{linux,macos,windows}-{pyqt,pyside}
envlist = py{39,312}-{linux,macos,windows}-{pyqt,pyside}
Copy link
Contributor

@Czaki Czaki Sep 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
envlist = py{39,312}-{linux,macos,windows}-{pyqt,pyside}
envlist = py39-{linux,macos,windows}-{pyqt,pyside},py312-{linux,macos,windows}-pyqt

This may be a better solution

Copy link
Member Author

Choose a reason for hiding this comment

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

Awesome, thanks!

Czaki
Czaki reviewed Sep 19, 2024
View reviewed changes
Copy link
Contributor

@Czaki Czaki left a comment •
edited
Loading

Choose a reason for hiding this comment

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

what with qt6 bindings?

@jni
Copy link
Member Author

jni commented Sep 19, 2024 •
edited by Czaki
Loading

what with qt6 bindings?

I suggest leaving that to a future PR after this one is green and merged and then merged into #18.

@jni jni merged commit 29b68a3 into napari:main Sep 19, 2024
7 checks passed
@jni jni deleted the fix-ci branch September 19, 2024 08:12
@jni jni mentioned this pull request Sep 19, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Czaki Czaki Czaki approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jni @Czaki