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.

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

MAINT: Update dependencies and revitalize the CI pipeline #507

Merged
merged 20 commits into from
Apr 27, 2023

Conversation

florin-pop
Copy link
Collaborator

@florin-pop florin-pop commented Apr 26, 2023

This PR fixes #506 by introducing the following changes:

  • have pip install packages directly from git instead of GitHub tarballs or zipballs
  • replace footer_items (which is deprecated) with footer_start in doc/conf.py
  • fixes a typo
  • install libxcb-cursor0 in addition to the rest of libxcb dependencies

These fixes were mostly adaptations of changes introduced by @larsoner in https://github.com/mne-tools/mne-python/


Contributed with ❤️ by AE Studio

@rob-luke rob-luke mentioned this pull request Apr 26, 2023
@codecov
Copy link

codecov bot commented Apr 26, 2023

Codecov Report

Merging #507 (3f0384a) into main (ad218df) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #507   +/-   ##
=======================================
  Coverage   95.36%   95.36%           
=======================================
  Files          69       69           
  Lines        2781     2781           
  Branches      397      397           
=======================================
  Hits         2652     2652           
  Misses         65       65           
  Partials       64       64           
Impacted Files Coverage Δ
mne_nirs/statistics/_glm_level_first.py 87.79% <ø> (ø)

@florin-pop florin-pop changed the title Fix CI MAINT: Update dependencies and revitalize the CI pipeline Apr 26, 2023
@florin-pop florin-pop requested a review from rob-luke April 26, 2023 17:46
@florin-pop florin-pop marked this pull request as ready for review April 26, 2023 17:46
@@ -13,7 +13,7 @@ jobs:
docker:
# Use 18.04 rather than 20.04 because MESA 20.0.8 on 18.04 has working
# transparency but 21.0.3 on 20.04 does not!
- image: cimg/base:stable-18.04
- image: cimg/base:2023.03-18.04
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm not sure that this change is needed, I'll revert it and try again.

Copy link
Member

Choose a reason for hiding this comment

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

This comment is very old and IIRC 22.04 mesa might actually be okay. Here I'd do whatever we do in MNE-Python's CircleCI config as things are tested/updated much more often there...

Copy link
Member

Choose a reason for hiding this comment

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

(you'll need to make sure you have the MNE_3D_OPTION stuff equivalent between the two... IIRC we discovered the transparency bug was due to full-screen antialiasing being enabled or something)

@@ -27,6 +27,7 @@ jobs:
OPENBLAS_NUM_THREADS: '1'
PYTHONUNBUFFERED: '1'
PYTHON_VERSION: '3.10'
QT_DEBUG_PLUGINS: '1'
strategy:
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will be reverted as well before merge.

Copy link
Member

Choose a reason for hiding this comment

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

Please leave in draft PR merge while there are things you intend to revert so we don't accidentally merge things that are intended for debugging.

Copy link
Member

Choose a reason for hiding this comment

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

I realised I have access to revert the change ;) Done! THanks Florin

@@ -33,7 +33,7 @@ xlrd
imageio>=2.6.1
imageio-ffmpeg>=0.4.1
traitlets
pyvista>=0.32,!=0.35.2,!=0.38.0,!=0.38.1,!=0.38.2,!=0.38.3
pyvista>=0.32,!=0.35.2,!=0.38.0,!=0.38.1,!=0.38.2,!=0.38.3,!=0.38.4,!=0.38.5
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm not happy with this change. What do you think about pinning pyvista to >=0.32,<0.38?

Copy link
Member

Choose a reason for hiding this comment

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

Agreed it's ugly, but IIRC the bug is/should be fixed in their main so it should work with the next release 🤷

Copy link
Member

Choose a reason for hiding this comment

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

Let's stick with ugly then

@rob-luke
Copy link
Member

Thanks @florin-pop it looks good to me. I also looked through the rendered docs and they were correct (including the 3d renders).

Could you please revert the change you wanted to revert and then ping Eric to merge.

@rob-luke
Copy link
Member

Could you please revert the change you wanted to revert and then ping Eric to merge.

I remembered I can revert the change myself ;) So we don't need to bug Eric now and I'll merge when all green

@rob-luke rob-luke enabled auto-merge (squash) April 27, 2023 01:54
@rob-luke rob-luke disabled auto-merge April 27, 2023 05:37
@rob-luke
Copy link
Member

This is absolutely super! Thanks @florin-pop

@rob-luke rob-luke merged commit 4a845ae into mne-tools:main Apr 27, 2023
@rob-luke rob-luke mentioned this pull request Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix all continuous integration errors
3 participants