Prepare for 6.1.1 release. #503
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit ebca726)
Fixes enthought/mayavi#1182 Co-authored-by: Mark Dickinson <mdickinson@enthought.com> (cherry picked from commit f23ea38)
PR updating and fixing our CI for newest Ubuntu and other changes: - [x] Fix apt-get package list for Ubuntu-22.04 - [x] Move OS package installation into a separate composite action - [x] Replace uses of `GabrielBB/xvfb-action` action with `xvfb-run` - [x] Drop matrix entries that require Python 3.6 from `actions/setup-python` - [x] Drop PySide2 testing in non-EDM tests (test only on PySide6) - [x] Bypass copyright year check for now, to avoid cluttering this PR with copyright fixes; I'll open another issue for this. (#492) We have three tests that have been causing problematic segfaults: #476. Those are increasingly interfering with CI runs, even for changes that have nothing to do with the relevant code, so I'm going to skip those tests unconditionally in CI + Linux. (That's far from ideal, but I don't see a better solution.) (cherry picked from commit 18da311)
Inspired by discussion in #489, where @corranwebster observes that: > But there is something a bit dodgy about _initialize_application_home in that it isn't using self.state_location but a hard-coded path instead: if state_location changes after __init__ then you'll end up with this situation. And indeed `_initialize_application_home` should depend on `self.state_location` as the single point of truth for the location; the current code will create the wrong directory in the event that the user passed `state_location` when creating the application. This PR fixes that, and adds a regression test. (cherry picked from commit a83d697)
This PR updates copyright headers. For reviewers: the first commit was a simple unmodified search-and-replace, replacing all matches for the regex pattern "-2022\b" in the codebase with "-2023". The second commit contains a manual change to remove the copyright end year pin in the flake8 run. Closes #492 (cherry picked from commit 1c821b4)
This PR fixes the wxPython workflow: - Use ubuntu-latest instead of ubuntu-20.04 (this also fixes that we were testing for ubuntu-latest when deciding whether to use xvfb-run or not) - Add libnotify.so.4 as a wxPython dependency - Use the ubuntu-22.04 wheel for wxPython It also updates the `action/cache` version, in response to warnings. Test run: https://github.com/enthought/envisage/actions/runs/3854233633 (cherry picked from commit 7e1cde8)
Uses sys.executable instead of 'python' to generate eggs to ensure the eggs are generated for the currently running python version. (cherry picked from commit 301c2ab)
corranwebster
approved these changes
Feb 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
mainto the 6.1.x maintenance branch:This PR should be merged using a regular merge (or a rebase) rather than a squash merge, so that commits relating to the separate PRs remain distinct (and retain proper attribution). The merge commit will be tagged with "6.1.1".
Closes #498.