From 24fa403b149aea7d102bafe5bb9fd70821f76be9 Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Tue, 12 Dec 2023 17:19:28 -0500 Subject: [PATCH] Remove sub-dependencies now that lockfile is in place; update README --- README.md | 8 +++++--- workstation-bootstrap/poetry.lock | 2 +- workstation-bootstrap/pyproject.toml | 11 +---------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index adb7df3d..cd005683 100644 --- a/README.md +++ b/README.md @@ -74,9 +74,11 @@ If we have to update the tool, use the following steps rm -rf .venv make install-deps source .venv/bin/activate -# Update the workstation-bootstrap/pyproject.toml file as required. -# Then update the lockfile: -poetry -C workstation-bootstrap/ lock +# Perform the required dependency operations using Poetry. +# Use "poetry update " to update an individual dependency per pyproject.toml +# Use "poetry lock --no-update" to pick up pyproject.toml additions/removals +# Use -C to run commands in the workstation-bootstrap directory, e.g.: +poetry -C workstation-bootstrap/ lock --no-update # Now we are ready to build updated wheels: ./scripts/build-sync-wheels --project workstation-bootstrap --pkg-dir ./workstation-bootstrap # Once the new wheels are ready, we recreate our sha256sums: diff --git a/workstation-bootstrap/poetry.lock b/workstation-bootstrap/poetry.lock index 9c53fa81..d091c9dd 100644 --- a/workstation-bootstrap/poetry.lock +++ b/workstation-bootstrap/poetry.lock @@ -223,4 +223,4 @@ test = ["pytest (>=3.0.0)", "pytest-cov"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "164e75e317044a8b5d11dcd6022e676936113e336df7cdf2350b59e0a72993dd" +content-hash = "82e66fdec9da207381c7afc17ccdd44d27f24100938406992cff0e71d922f61a" diff --git a/workstation-bootstrap/pyproject.toml b/workstation-bootstrap/pyproject.toml index 253752bc..25b01305 100644 --- a/workstation-bootstrap/pyproject.toml +++ b/workstation-bootstrap/pyproject.toml @@ -14,13 +14,4 @@ pip = "21.3.1" setuptools-scm = "5.0.2" pytest-runner = "5.3.0" cython = "0.29.33" -flit-core = "2.3.0" -# Sub-dependencies which we're explicitly freezing for now, -# to ensure consistent build behavior with pip-compile based -# boostrap. -packaging = "20.9" -pyparsing = "2.4.7" -pep517 = "0.9.1" -pytoml = "0.1.21" -toml = "0.10.2" -setuptools = "54.0.0" \ No newline at end of file +flit-core = "2.3.0" \ No newline at end of file