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

add a cache key to venv restore plugin for easy busting #221

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 2 additions & 0 deletions .github/workflows/pulumi-aws-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
id: pulumi-aws-tests-cache-virtualenv
with:
requirement_files: pulumi/python/Pipfile.lock
custom_cache_key_element: v2

- uses: syphar/restore-pip-download-cache@v1
if: steps.pulumi-aws-tests-cache-virtualenv.outputs.cache-hit != 'true'
Expand All @@ -34,6 +35,7 @@ jobs:
id: pulumi-aws-tests-cache-virtualenv
with:
requirement_files: pulumi/python/Pipfile.lock
custom_cache_key_element: v2

- uses: syphar/restore-pip-download-cache@v1
if: steps.pulumi-aws-tests-cache-virtualenv.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.9.12
3.11.1
4 changes: 2 additions & 2 deletions bin/setup_venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ fi

# Install general package requirements
# `pipenv sync` uses only the information in the `Pipfile.lock` ensuring repeatable builds
PIPENV_VERBOSITY=-1 PIPENV_PIPFILE="${script_dir}/../pulumi/python/Pipfile" pipenv sync

PIPENV_VERBOSITY=1 PIPENV_PIPFILE="${script_dir}/../pulumi/python/Pipfile" pipenv clean
PIPENV_VERBOSITY=1 PIPENV_PIPFILE="${script_dir}/../pulumi/python/Pipfile" pipenv sync --verbose
# Install local common utilities module
pip3 install "${script_dir}/../pulumi/python/utility/kic-pulumi-utils"

Expand Down
1 change: 1 addition & 0 deletions pulumi/python/.tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python 3.11.1
47 changes: 24 additions & 23 deletions pulumi/python/Pipfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
[[source]]
url = "https://pypi.org/simple"
url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[packages]
awscli = "~=1.25.35"
grpcio = "==1.43.0"
fart = "~=0.1.5"
lolcat = "~=1.4"
passlib = "~=1.7.4"
pulumi-aws = ">=4.39.0"
pulumi-docker = "==3.1.0"
pulumi-eks = ">=0.41.2"
pulumi-kubernetes = "==3.20.1"
pycryptodome = "~=3.14.0"
requests = "~=2.27.1"
setuptools-git-versioning = "==1.9.2"
yamlreader = "==3.0.4"
pulumi-digitalocean = "==4.12.0"
pulumi-linode = "==3.7.1"
linode-cli = "~=5.17.2"
pulumi = "~=3.36.0"
PyYAML = "~=5.4.1"
nodeenv = "~=1.6.0"
awscli = "~=1.27"
grpcio = "*"
fart = "*"
lolcat = "*"
pulumi-aws = "*"
pulumi-docker = "*"
pulumi-eks = "*"
pulumi-kubernetes = "*"
pycryptodome = "*"
requests = "*"
setuptools-git-versioning = "*"
yamlreader = "*"
pulumi-digitalocean = "*"
pulumi-linode = "*"
linode-cli = "*"
pulumi = "*"
nodeenv = "*"
pyyaml = "*"
passlib = "*"
GitPython = "*"

[dev-packages]
wheel = "~=0.37.1"
nodeenv = "~=1.6.0"
wheel = "*"
nodeenv = "*"

[requires]
python_version = "3.9"
python_version = "3.11"
384 changes: 207 additions & 177 deletions pulumi/python/Pipfile.lock

Large diffs are not rendered by default.

21 changes: 0 additions & 21 deletions pulumi/python/requirements.txt

This file was deleted.

4 changes: 1 addition & 3 deletions pulumi/python/utility/kic-pulumi-utils/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@
setup_requires=['setuptools-git-versioning'],
version_config=True,
packages=['kic_util'],
install_requires=[
'pyyaml>=5.3.1,<6.0', 'passlib>=1.7.4,<2.0.0', 'GitPython>=3.1.18,<3.2.0'
])
install_requires=[])