[webkitcorepy] Packaging requires pyparsing #18232
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
JonWBedard
added
the
Tools / Tests
|
EWS run on previous version of this PR (hash 43354a5) |
gsnedders
reviewed
Sep 26, 2023
| @@ -277,10 +277,11 @@ def install(self): | |||
| return | |||
|
|
|||
| # Make sure that setuptools, tomli, setuptools_scm, wheel and packaging are installed, since setup.py relies on them | |||
| if self.name not in ['wheel', 'packaging', 'setuptools', 'tomli', 'setuptools_scm']: | |||
| if self.name not in ['setuptools', 'wheel', 'pyparsing', 'packaging', 'tomli', 'setuptools_scm']: | |||
There was a problem hiding this comment.
This makes the comment above incorrect.
webkit-ews-buildbot
added
the
merging-blocked
JonWBedard
removed
the
merging-blocked
JonWBedard
force-pushed
the
eng/webkitcorepy-Packaging-requires-pyparsing
branch
from
43354a5
to
16e4e7a
Compare
This was referenced Sep 27, 2023
emw-apple
approved these changes
Sep 27, 2023
| @@ -433,6 +429,11 @@ class AutoInstall(object): | |||
| DISABLE_ENV_VAR = 'DISABLE_WEBKITCOREPY_AUTOINSTALLER' | |||
| CA_CERT_PATH_ENV_VAR = 'AUTOINSTALL_CA_CERT_PATH' | |||
|
|
|||
| # This list of libraries is required to install other libraries, and must be installed first | |||
| BASE_LIBRARIES = ['setuptools', 'wheel', 'pyparsing', 'packaging', 'setuptools_scm'] | |||
There was a problem hiding this comment.
Install order is changing from wheel, packaging, setuptools to setuptools, wheel, packaging. Is that intentional?
There was a problem hiding this comment.
That is intentional. wheel needs setuptools, packaging needs pyparsing
Comment on lines
433
to
435
| BASE_LIBRARIES = ['setuptools', 'wheel', 'pyparsing', 'packaging', 'setuptools_scm'] | ||
| if sys.version_info >= (3, 0): | ||
| BASE_LIBRARIES.insert(-1, 'tomli') |
There was a problem hiding this comment.
Since (IIUC) tomli is needed to install setuptools_scm, I think it's clearer and less error-prone to say:
Suggested change
| BASE_LIBRARIES = ['setuptools', 'wheel', 'pyparsing', 'packaging', 'setuptools_scm'] | |
| if sys.version_info >= (3, 0): | |
| BASE_LIBRARIES.insert(-1, 'tomli') | |
| BASE_LIBRARIES = ['setuptools', 'wheel', 'pyparsing', 'packaging'] | |
| if sys.version_info >= (3, 0): | |
| BASE_LIBRARIES += ['tomli', 'setuptools_scm'] | |
| else: | |
| BASE_LIBRARIES += ['setuptools_scm'] |
(And you could of course collapse this into one or two statements as desired)
JonWBedard
force-pushed
the
eng/webkitcorepy-Packaging-requires-pyparsing
branch
from
16e4e7a
to
7858c2e
Compare
JonWBedard
added
skip-ews
|
EWS run on current version of this PR (hash 7858c2e)
|
https://bugs.webkit.org/show_bug.cgi?id=262124 rdar://116062896 Reviewed by Elliott Williams. * Tools/Scripts/libraries/webkitcorepy/setup.py: Bump version. * Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto. * Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py: (Package.install): Install pyparsing before packaging. Canonical link: https://commits.webkit.org/268523@main
webkit-commit-queue
force-pushed
the
eng/webkitcorepy-Packaging-requires-pyparsing
branch
from
7858c2e
to
5bae443
Compare
|
Committed 268523@main (5bae443): https://commits.webkit.org/268523@main Reviewed commits have been landed. Closing PR #18232 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-merge-queue
|
Ugh, wrong version of this change landed. A moment, let me re-land correctly.... |
|
Landed correctly in #18311 |
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.
5bae443
7858c2e
🧪 style🛠 ios🛠 mac🛠 wpe🛠 wincairo🧪 bindings🛠 ios-sim🛠 mac-AS-debug🧪 wpe-wk2🧪 webkitperl🧪 ios-wk2🧪 api-mac🛠 gtk🧪 webkitpy🧪 ios-wk2-wpt🧪 mac-wk1🧪 gtk-wk2🧪 api-ios🧪 mac-wk2🧪 api-gtk🛠 tv🧪 mac-AS-debug-wk2🧪 services🛠 tv-sim🧪 mac-wk2-stress🛠 watch🛠 watch-sim