Backport PRs #888 and #889 to 5.2 maintenance branch#890
Merged
Conversation
added 2 commits
November 9, 2021 11:36
* FIX : Fix issue with pyparsing version >= 3 fixes #887 This PR fixes an issue because of an upstream change with the pyparsing CaselessLiteral class, where the name attribute became a read-only property in version >= 3. We now use the new public set_name method instead of directly setting the attribute. * FIX : Handle pyparsing versions 2 and 3 accordingly the new set_name API is only available on pyparsing version >= 3 so we use packaging to handle the behavior according to the version this commit makes packaging a dependency of the svg backend and this commit adds a regression test modified: enable/__init__.py modified: enable/savage/svg/pathdata.py modified: enable/savage/svg/tests/test_pathdata.py * REF : Go with a simpler solution of checking for the method name instead of manually parsing and checking the pyparsing version and calling the relevant method depending on the version, we simply check for the existence of the set_name method now and use it if it exists. If it doesnt, we fall back to the old setName method The dependence of packaging has now been removed because we dont need to parse the version anymore modified: enable/__init__.py modified: enable/savage/svg/pathdata.py
* FIX : Test on ubuntu-18.04, not 16.04 ubuntu-16.04 is no longer available on GitHub Actions CI * FIX : Use ubuntu-latest instead of ubuntu-18.04 * FIX : Use ubuntu-18.04 with the right package repository modified: .github/workflows/test-with-edm.yml modified: ci/edmtool.py * FIX : Install libsdl2-dev using the ubuntu package manager modified: .github/workflows/test-with-edm.yml * FIX : Use libsdl1.2, not libsdl2 modified: .github/workflows/test-with-edm.yml
rahulporuri
changed the title
jwiggins
approved these changes
Nov 9, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 backports PR #888 and #889 to the
maint/5.2maintenance branch. Once this PR is merged, we will be able to make a 5.2.2 bugfix release. Note : We'll be able to make a release not that we're planning to.