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

fix(superchain): installed setuptools is an unsupported version #4333

Merged
merged 3 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/jsii-pacmak/test/build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ else
# Hello Windows!
. ${venv}/Scripts/activate
fi
${PYTHON} -m pip install --upgrade pip~=22.1 twine~=4.0

# Note the venv is not used by the jsii-pacmak commands
${PYTHON} -m pip install --upgrade pip>=23.3.1 setuptools>=68.2.2 wheel>=0.41.3 twine~=4.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The venv isn't actually used to run pacmak for some reason. So this change doesn't have any effect on the failure in question. I could revert it, but feels better to also require an explicit version here.


# Provision a specific NuGet package cache
NUGET_CACHE=${outdir}/.nuget/packages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ beforeAll(async () => {
[
'[tool.pyright]',
'defineConstant = { DEBUG = true }',
'pythonVersion = "3.7"',
'pythonVersion = "3.8"',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was just a miss in the python3.8 PR

'pythonPlatform = "All"',
'reportSelfClsParameterName = false',
`venvPath = ${JSON.stringify(path.dirname(venv.venvRoot))}`,
Expand Down
2 changes: 1 addition & 1 deletion superchain/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ RUN apt-get update
&& apt-get -y install python3-dev python3-pip python3-venv \
&& coercepip='--break-system-packages' \
&& if [[ ${DEBIAN_VERSION} == "buster" || ${DEBIAN_VERSION} == "bullseye" ]]; then coercepip=''; fi \
&& python3 -m pip install ${coercepip} pipx \
&& python3 -m pip install ${coercepip} pipx "pip>=23.3.1" "setuptools>=68.2.2" "wheel>=0.41.3" \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the change!

&& rm -rf /var/lib/apt/lists/*

# Install Python tools globally using pipx (install globally)
Expand Down
Loading