From 07c2ef055d3f7ff0f82a7abf9f0b4754b5ecede3 Mon Sep 17 00:00:00 2001 From: Zeid <2043828+zzzeid@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:23:06 -0500 Subject: [PATCH] requirements: pin mercurial version (bug 1941011) (#192) - pin mercurial version to 6.1.4 - change Python version to 3.11 to support mercurial version --- .github/workflows/build.yml | 2 +- Dockerfile | 2 +- pyproject.toml | 1 + requirements.txt | 15 ++++++++++++++- src/lando/tests/test_formatting.py | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5dcb5835..3a251a68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.12" + python-version: "3.11" - name: Install dependencies run: | python -m venv env diff --git a/Dockerfile b/Dockerfile index 27dcd37b..dd97fdb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12 +FROM python:3.11 EXPOSE 80 ENV PYTHONUNBUFFERED=1 diff --git a/pyproject.toml b/pyproject.toml index 72ee7c27..45ea86bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,7 @@ dependencies = [ "django_compressor", "jinja2", "kombu", + "mercurial==6.1.4", "mots", "mozilla_django_oidc", "networkx", diff --git a/requirements.txt b/requirements.txt index 5f5e07d0..d1eed9cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --all-build-deps --allow-unsafe --extra=code-quality,testing --generate-hashes --output-file=requirements.txt pyproject.toml @@ -875,6 +875,19 @@ markupsafe==3.0.2 \ --hash=sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430 \ --hash=sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50 # via jinja2 +mercurial==6.1.4 \ + --hash=sha256:216647dbe7dd217b075ecfc1011fe04af486abe4f2de88cbad0ab2690cce6908 \ + --hash=sha256:335c8760f81fd8e268a14c1fa795d4cc8f91b0f4e953418a05e9fbde93f2c0eb \ + --hash=sha256:54f7c59ca2bce4b4ff01f67287dd4301a4d8b7dd169c390ed89ab73e1dc1fac2 \ + --hash=sha256:6c6e65652de9bd7084d36ee8416bf07484bc4d97daa2bb43c226e1a3e1084233 \ + --hash=sha256:a067b70043667263525aedf17ab8bfc0057228eb348a4d88361fc1853d3670d1 \ + --hash=sha256:ab578daec7c21786c668b0da2e71282a290d18010255719f78d0e55145020d46 \ + --hash=sha256:b1016da7577581ea87bcfbd937cf2f2e51d172ca405b904bc8d4a5debe3cbb8c \ + --hash=sha256:b1eb4c276a4b67058ff0dd45848abd05245ac44c27f624d25c2ca32796d04804 \ + --hash=sha256:c8a6cc1a3ef85fb4d5fe930cac7caee6c4964730cb953fa467121fd152fa4245 \ + --hash=sha256:eb4bb33a3760072a794b8862c594d461a1a4feefa9989de533e63d428ce99bdd \ + --hash=sha256:f361f9802b36e357ac019ceb712ca11de8332b07deadeed8dfa904f05bf7ca78 + # via lando (pyproject.toml) mots==0.13.2 \ --hash=sha256:39dc2eddef877d922b4bd71660975ee514f893c9465428aff5364bbcc7fdc357 \ --hash=sha256:c433bf5fae7e3b8897b353ef37ac0e19871addee3b391355ea2e11c73c597bd8 diff --git a/src/lando/tests/test_formatting.py b/src/lando/tests/test_formatting.py index f891067c..f75a27ed 100644 --- a/src/lando/tests/test_formatting.py +++ b/src/lando/tests/test_formatting.py @@ -17,7 +17,7 @@ def test_ruff(): passed = [] for lint_path in LINT_PATHS: passed.append( - subprocess.call(("ruff", "check", lint_path, "--target-version", "py310")) + subprocess.call(("ruff", "check", lint_path, "--target-version", "py311")) == 0 ) assert all(passed), "ruff did not run cleanly."