Skip to content

Commit

Permalink
small fixes and debug
Browse files Browse the repository at this point in the history
  • Loading branch information
4141done committed Nov 8, 2023
1 parent dd70919 commit b4944cd
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 81 deletions.
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.9.12
3.9.18
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python 3.9.18
11 changes: 8 additions & 3 deletions bin/setup_venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ source "${VIRTUAL_ENV}/bin/activate"

set -o nounset # abort on unbound variable

echo "USING PYTHON VERSION $(python --version)"
echo "PIP VERSION $(pip3 --version)"
echo "USING PYTHON VERSION $(python --version) FROM $(which python)"
echo "PIP VERSION $(pip3 --version) FROM $(which pip3)"

# Use the latest version of pip and pipenv
pip3 install --upgrade pip
Expand All @@ -202,9 +202,10 @@ pip3 install pipenv
# in the installation of other build tools and dependencies
# required by the other python packages.
pip3 install wheel
pip3 install nodeenv

# `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 --dev
# PIPENV_VERBOSITY=-1 PIPENV_PIPFILE="${script_dir}/../pulumi/python/Pipfile" pipenv sync --dev

# Install node.js into virtual environment so that it can be used by Python
# modules that make call outs to it.
Expand All @@ -214,10 +215,14 @@ else
echo "Node.js version $("${VIRTUAL_ENV}/bin/node" --version) is already installed"
fi

echo "About to install deps"
# 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


echo "about to install local pulumi utils"
pip3 install setuptools
# Install local common utilities module
pip3 install "${script_dir}/../pulumi/python/utility/kic-pulumi-utils"

Expand Down
3 changes: 0 additions & 3 deletions pulumi/python/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ yamlreader = "==3.0.4"
pulumi-digitalocean = "==4.12.0"
pulumi = "~=3.36.0"
PyYAML = "5.3.1"
nodeenv = "~=1.6.0"
wheel = "0.37.1"
[dev-packages]
wheel = "0.37.1"
nodeenv = "~=1.6.0"

Expand Down
145 changes: 71 additions & 74 deletions pulumi/python/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b4944cd

Please sign in to comment.