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.

Sign up for GitHub

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

Jump to bottom

chore: Bump pyyaml to version 6, revert pyyaml pins #5573

Merged
merged 2 commits into from
Jul 20, 2023
Merged

chore: Bump pyyaml to version 6, revert pyyaml pins #5573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23e5b55
chore: Bump pyyaml to version 6, revert pyyaml pins
mildaniel Jul 19, 2023
66c6baa
Update reproducible reqs
mildaniel Jul 19, 2023
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
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
SAM_CLI_TELEMETRY ?= 0

init:
pip install wheel
pip install "cython<3.0.0" pyyaml==5.4.1 --no-build-isolation
pip uninstall wheel cython --yes
SAM_CLI_DEV=1 pip install -e '.[dev]'

test:
Expand Down
10 changes: 0 additions & 10 deletions installer/pyinstaller/build-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@ cd ..
echo "Installing Python Libraries"
python3 -m venv venv
./venv/bin/pip install --upgrade pip

# https://github.com/yaml/pyyaml/issues/724
echo "Force cython package version to be lower than 3.x.x"
./venv/bin/pip install wheel
./venv/bin/pip install --no-build-isolation "cython<3.0.0" pyyaml==5.4.1

echo "Uninstall local cython package"
./venv/bin/pip uninstall wheel cython --yes
# end cython work around

./venv/bin/pip install -r src/requirements/reproducible-linux.txt

echo "Copying All Python Libraries"
Expand Down
10 changes: 0 additions & 10 deletions installer/pyinstaller/build-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,6 @@ cd ..
echo "Installing Python Libraries"
/usr/local/bin/python3.8 -m venv venv
./venv/bin/pip install --upgrade pip

# https://github.com/yaml/pyyaml/issues/724
echo "Force cython package version to be lower than 3.x.x"
./venv/bin/pip install wheel
./venv/bin/pip install --no-build-isolation "cython<3.0.0" pyyaml==5.4.1

echo "Uninstall local cython package"
./venv/bin/pip uninstall wheel cython --yes
# end cython work around

./venv/bin/pip install -r src/requirements/reproducible-mac.txt

echo "Copying All Python Libraries"
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Flask<2.3
boto3>=1.26.109,==1.*
jmespath~=1.0.1
ruamel_yaml~=0.17.32
PyYAML>=5.4.1,==5.*
PyYAML>=6.0.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: Should be do ~=6.0,>=6.0.1?

This will get at least 6.0.1 but won't do major version bump expectedly

cookiecutter~=2.1.1
aws-sam-translator==1.71.0
#docker minor version updates can include breaking changes. Auto update micro version only.
Expand Down
Loading