Add support for Homebrew and Chocolatey #9187

Avasam · 2022-11-13T07:55:32Z

I have added support to specify packages to install using Homebrew on MacOS and Chocolatey on Windows. Both come pre-install on the Github Action environments.

~~Fixed all affected stubs (JACK-Client, pyaudio, and PycURL)~~
~~Added ignore_missing_stub = false and completed said stubs~~
Edit: #9205, #9206 and #9207
Locally validated the installs on both MacOS and Windows.

~~JACK-Client should be the same on all platforms. I'm only running it on all platforms to prove that the brew and choco installs work. Before merging it should not have any platforms specified.~~
Edit: Done!

Special notes about pycurl:
The pycurl install on Windows is currently broken as it depends on a version of setuptools that's too old.
That's fixed in their master branch, but still requires to be built from source and does not provide wheels (yet).

The pycurl install on MacOS is too complicated for the CI and does not work with stubtest (unless I'm doing it wrong):

% brew install openssl
% export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
% export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
% pip install --compile --install-option="--with-openssl" pycurl

Fixed all affected stubs ignore_missing_stub = false and completed stubs Validated new pycurl constants on macos by manually importing

…upport

stubs/pycurl/METADATA.toml

AlexWaygood · 2022-11-15T20:53:53Z

There's quite a lot going on in this PR all at once, which makes it a little hard to review:

Any -> Incomplete for several annotations
missing symbols added to several stubs packages so that we can enable ignore_missing_stub = false
New "infrastructure" changes so that we can install dependencies via homebrew or chocolatey when required.

Many of these look like good changes, but would you mind splitting it up into a few smaller PRs, so that we can consider them in isolation? :)

Split off from python#9187 Turned off `ignore_missing_stub` for pyaudio stubs. Ensured it's valid for Windows and MacOS.

Split off from python#9187 Turned off `ignore_missing_stub` for pycurl stubs. Ensured it's valid for MacOS.

Avasam · 2022-11-15T21:32:25Z

There's quite a lot going on in this PR all at once, which makes it a little hard to review:
[...] Many of these look like good changes, but would you mind splitting it up into a few smaller PRs, so that we can consider them in isolation? :)

Absolutely! #9205, #9206 and #9207 . Tackling these first will reduce the changes in this PR.

Split off from #9187 Turned off `ignore_missing_stub` for pyaudio stubs. Ensured it's valid for Windows and MacOS.

AlexWaygood · 2022-11-21T23:41:41Z

There's quite a lot going on in this PR all at once, which makes it a little hard to review:
[...] Many of these look like good changes, but would you mind splitting it up into a few smaller PRs, so that we can consider them in isolation? :)

Absolutely! #9205, #9206 and #9207 . Tackling these first will reduce the changes in this PR.

Thanks so much! The changes in this PR are much more manageable now :)

AlexWaygood

LGTM other than @sobolevn's point about the unnecessary brew_dependency entry for pycurl

AlexWaygood · 2022-11-22T00:39:55Z

(The CI failure will be fixed by #9243.)

AlexWaygood · 2022-11-22T10:52:40Z

Ah, looks like we now have a new CI failure due to the fact that 0 packages are being passed into the choco install step.

sobolevn · 2022-11-22T11:01:17Z

.github/workflows/daily.yml

+              NONINTERACTIVE=1 brew install $PACKAGES
+            fi
+
+            if [ "${{ matrix.os }}" = "windows-latest" ]; then


Suggested change

if [ "${{ matrix.os }}" = "windows-latest" ]; then

if [ "${{ matrix.os }}" = "windows-latest" ] && [ ! -z "$PACKAGES" ]; then

@AlexWaygood can you please apply this change? :)

This will fix the CI and we can merge it.

It's probably worth making this change to the apt_dependencies and brew_dependencies branches of this script as well, right? What if we remove stubs for JACK-Client and pyaudio at some point in the future, and then the CI randomly starts failing because suddenly we're passing in 0 packages to the brew install part of this workflow?

Anyway, is there a massive rush? It's @Avasam's PR, I'd prefer to let him respond to this suggestion :)

No rush on my side. I simply wanted to complete all the stubs that benefited from sobolevn's work with multi-platform support. And this is the last PR in that series.

I've added the check for brew installs and, whilst unlikely, apt installs as well. It doesn't hurt.

I've also changed the os condition to use runner.os instead of matrix.os. This way the exact os version can be updated without braking the condition.

We're about to get a daily test failure with 63 stubtest errors (see the Ubuntu stubtest failure in #9187) due to the release of redis-py 4.3.5, and I'd rather that didn't happen.

…o brew-support

…upport

github-actions · 2022-11-24T03:51:55Z

According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉

sobolevn

Thanks!

AlexWaygood

Thanks @Avasam! 🎉

Add support for Homebrew and Chocolatey

3378ba2

Fixed all affected stubs ignore_missing_stub = false and completed stubs Validated new pycurl constants on macos by manually importing

This comment has been minimized.

Sign in to view

Avasam added 2 commits Nov 13, 2022

Update contibuting.md

9c9c95f

__docformat__: str

75a4b2a

This comment has been minimized.

Sign in to view

Merge branch 'main' of https://github.com/python/typeshed into brew-s…

65f5f61

…upport

This comment has been minimized.

Sign in to view

sobolevn reviewed Nov 15, 2022

View changes

stubs/pycurl/METADATA.toml Outdated Show resolved Hide resolved

Avasam mentioned this pull request Nov 15, 2022

Add missing symbols in JACK-Client stubs #9205

Merged

Avasam added a commit to Avasam/typeshed that referenced this pull request Nov 15, 2022

Add missing symbols in pyaudio stubs

5ed2814

Split off from python#9187 Turned off `ignore_missing_stub` for pyaudio stubs. Ensured it's valid for Windows and MacOS.

Avasam mentioned this pull request Nov 15, 2022

Add missing symbols in pyaudio stubs #9206

Merged

Avasam added a commit to Avasam/typeshed that referenced this pull request Nov 15, 2022

Add missing symbols in pycurl stubs

a3e34df

Split off from python#9187 Turned off `ignore_missing_stub` for pycurl stubs. Ensured it's valid for MacOS.

Avasam mentioned this pull request Nov 15, 2022

Add missing symbols in pycurl stubs #9207

Merged

JelleZijlstra pushed a commit that referenced this pull request Nov 16, 2022

Add missing symbols in pyaudio stubs (#9206)

41d5084

Split off from #9187 Turned off `ignore_missing_stub` for pyaudio stubs. Ensured it's valid for Windows and MacOS.

Merge branch 'main' into brew-support

8057402

AlexWaygood reviewed Nov 21, 2022

View changes

AlexWaygood requested a review from JelleZijlstra Nov 21, 2022

This comment has been minimized.

Sign in to view

Avasam added 2 commits Nov 22, 2022

Commented out unneeded installs and removed redundant tests

41599ae

leftover $STUBS in daily.yml from copy/pasting

78a6d3e

This comment has been minimized.

Sign in to view

Merge branch 'main' into brew-support

ac0f469

sobolevn reviewed Nov 22, 2022

View changes

This comment has been minimized.

Sign in to view

AlexWaygood added a commit that referenced this pull request Nov 22, 2022

Pin redis to 4.3.4 in CI

0b509da

We're about to get a daily test failure with 63 stubtest errors (see the Ubuntu stubtest failure in #9187) due to the release of redis-py 4.3.5, and I'd rather that didn't happen.

AlexWaygood mentioned this pull request Nov 22, 2022

Pin redis to 4.3.4 in CI #9247

Merged

srittau pushed a commit that referenced this pull request Nov 22, 2022

Pin redis to 4.3.4 in CI (#9247)

a3de404

We're about to get a daily test failure with 63 stubtest errors (see the Ubuntu stubtest failure in #9187) due to the release of redis-py 4.3.5, and I'd rather that didn't happen.

Merge branch 'main' into brew-support

01db59c

This comment has been minimized.

Sign in to view

Avasam added 4 commits Nov 24, 2022

Use runner.os variable and check for $PACKAGES

8cce79d

Merge branch 'brew-support' of https://github.com/Avasam/typeshed int…

90dc75f

…o brew-support

Merge branch 'main' of https://github.com/python/typeshed into brew-s…

feefdd7

…upport

-n, not -z

7edd89b

AlexWaygood requested a review from sobolevn Nov 24, 2022

sobolevn approved these changes Nov 24, 2022

View changes

AlexWaygood approved these changes Nov 24, 2022

View changes

AlexWaygood merged commit 7050c1d into python:main Nov 24, 2022
90 checks passed

sobolevn mentioned this pull request Nov 24, 2022

check_consistent.py: Add check ensuring packages are not installed for unspecified platforms #9265

Merged

Add support for Homebrew and Chocolatey #9187

Add support for Homebrew and Chocolatey #9187

Avasam commented Nov 13, 2022 •

edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

AlexWaygood commented Nov 15, 2022

Avasam commented Nov 15, 2022

AlexWaygood commented Nov 21, 2022

AlexWaygood left a comment

This comment has been minimized.

AlexWaygood commented Nov 22, 2022

This comment has been minimized.

AlexWaygood commented Nov 22, 2022

sobolevn Nov 22, 2022 •

edited

sobolevn Nov 22, 2022

AlexWaygood Nov 22, 2022 •

edited

Avasam Nov 24, 2022 •

edited

This comment has been minimized.

This comment has been minimized.

github-actions bot commented Nov 24, 2022

sobolevn left a comment

AlexWaygood left a comment

	if [ "${{ matrix.os }}" = "windows-latest" ]; then
	if [ "${{ matrix.os }}" = "windows-latest" ] && [ ! -z "$PACKAGES" ]; then

Add support for Homebrew and Chocolatey #9187

Add support for Homebrew and Chocolatey #9187

Conversation

Avasam commented Nov 13, 2022 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

AlexWaygood commented Nov 15, 2022

Avasam commented Nov 15, 2022

AlexWaygood commented Nov 21, 2022

AlexWaygood left a comment

This comment has been minimized.

AlexWaygood commented Nov 22, 2022

This comment has been minimized.

AlexWaygood commented Nov 22, 2022

sobolevn Nov 22, 2022 • edited

Choose a reason for hiding this comment

sobolevn Nov 22, 2022

Choose a reason for hiding this comment

AlexWaygood Nov 22, 2022 • edited

Choose a reason for hiding this comment

Avasam Nov 24, 2022 • edited

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

github-actions bot commented Nov 24, 2022

sobolevn left a comment

AlexWaygood left a comment

Avasam commented Nov 13, 2022 •

edited

sobolevn Nov 22, 2022 •

edited

AlexWaygood Nov 22, 2022 •

edited

Avasam Nov 24, 2022 •

edited