Skip to content

Commit

Permalink
Merge pull request #2754 from digitalfabrik/pin-setuptools-version
Browse files Browse the repository at this point in the history
Pin pip & setuptools version in `pyproject.toml`
  • Loading branch information
timobrembeck authored May 5, 2024
2 parents 5879869 + ca68cd6 commit bab37ad
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ pinned = [
"parso==0.8.3",
"pexpect==4.9.0",
"pillow==10.2.0",
"pip==24.0",
"prompt-toolkit==3.0.43",
"protobuf==4.25.3",
"proto-plus==1.23.0",
Expand Down Expand Up @@ -209,6 +210,7 @@ pinned = [
"requests==2.31.0",
"rpds-py==0.17.1",
"rules==3.3",
"setuptools==65.5.0",
"sgmllib3k==1.0.0",
"six==1.16.0",
"sqlparse==0.4.4",
Expand Down
2 changes: 2 additions & 0 deletions tools/_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ SCRIPT_PATH="${DEV_TOOL_DIR}/${SCRIPT_NAME}"
SCRIPT_ARGS=("$@")
# The verbosity of the output (can be one of {0,1,2,3})
SCRIPT_VERBOSITY="1"
# Unset LC_COLLATE to make sorting deterministic and reproducible
LC_COLLATE=""

# This function prints the given input lines in red color
function print_error {
Expand Down
4 changes: 2 additions & 2 deletions tools/update_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ source .venv.tmp/bin/activate
# Install package locally (without the pinned extra, so the newest available versions are installed)
pip install -e .
# Parse the newly installed versions
PINNED_VERSIONS=$(pip freeze --exclude-editable --local | sort)
PINNED_VERSIONS=$(pip freeze --all --exclude-editable --local | sort)
PINNED_VERSIONS_TOML=$(echo "${PINNED_VERSIONS}" | format_pyproject_toml)
# Now also install dev dependencies
pip install -e .[dev]
# Parse the newly installed versions
PINNED_VERSIONS_ALL=$(pip freeze --exclude-editable --local | sort)
PINNED_VERSIONS_ALL=$(pip freeze --all --exclude-editable --local | sort)
# Only consider packages that were not already pinned in the normal dependencies
PINNED_DEV_VERSIONS=$(comm -3 <(echo "${PINNED_VERSIONS_ALL}") <(echo "${PINNED_VERSIONS}"))
PINNED_DEV_VERSIONS_TOML=$(echo "${PINNED_DEV_VERSIONS}" | format_pyproject_toml)
Expand Down

0 comments on commit bab37ad

Please sign in to comment.