diff --git a/.github/renovate.json b/.github/renovate.json index d9bc0341c..aaf386a62 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -9,5 +9,9 @@ "automergeSchedule": ["* * * * 2"] }, "packageRules": [ + { + "matchPackageNames": ["mypy"], + "rangeStrategy": "widen" + } ] } diff --git a/.github/workflows/mypy_primer.yml b/.github/workflows/mypy_primer.yml index fc38cf3a3..263119aa2 100644 --- a/.github/workflows/mypy_primer.yml +++ b/.github/workflows/mypy_primer.yml @@ -27,13 +27,17 @@ jobs: - uses: actions/setup-python@v6 with: python-version: "3.12" + - name: Install uv + uses: astral-sh/setup-uv@v7 - name: Install dependencies - run: pip install git+https://github.com/hauntsaninja/mypy_primer.git + run: | + uv venv + uv pip install git+https://github.com/hauntsaninja/mypy_primer.git - name: Run mypy_primer shell: bash run: | cd django-stubs_to_test - MYPY_VERSION=$(grep mypy== pyproject.toml | sed -n 's/ "mypy==\([^;]*\).*",/\1/p') + MYPY_VERSION=$(uv tree --package=mypy --depth=0 -q | sed -n 's/^mypy v\(.\+\)$/\1/p') echo "new commit" git checkout $GITHUB_SHA @@ -50,7 +54,7 @@ jobs: cd .. # fail action if exit code isn't zero or one ( - mypy_primer \ + uv run mypy_primer \ --new v${MYPY_VERSION} --old v${MYPY_VERSION} \ --known-dependency-selector django-stubs \ --old-prepend-path django-stubs_base --new-prepend-path django-stubs_to_test \ diff --git a/pyproject.toml b/pyproject.toml index dad5f157d..6401d10c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,6 @@ tests = [ "jinja2==3.1.6", "pyyaml==6.0.3", # typing: - "mypy==1.19.0", "django-stubs[compatible-mypy,oracle,redis]", ] pyright = [ diff --git a/uv.lock b/uv.lock index 111b407af..7138e12f7 100644 --- a/uv.lock +++ b/uv.lock @@ -246,7 +246,6 @@ dev = [ { name = "django" }, { name = "django-stubs", extra = ["compatible-mypy", "oracle", "redis"] }, { name = "jinja2" }, - { name = "mypy" }, { name = "mysqlclient" }, { name = "psycopg2-binary" }, { name = "pyrefly" }, @@ -267,7 +266,6 @@ tests = [ { name = "django" }, { name = "django-stubs", extra = ["compatible-mypy", "oracle", "redis"] }, { name = "jinja2" }, - { name = "mypy" }, { name = "mysqlclient" }, { name = "psycopg2-binary" }, { name = "pytest" }, @@ -296,7 +294,6 @@ dev = [ { name = "django", specifier = "==5.2.8" }, { name = "django-stubs", extras = ["compatible-mypy", "oracle", "redis"], editable = "." }, { name = "jinja2", specifier = "==3.1.6" }, - { name = "mypy", specifier = "==1.19.0" }, { name = "mysqlclient", specifier = "==2.2.7" }, { name = "psycopg2-binary", specifier = "==2.9.11" }, { name = "pyrefly", specifier = "==0.43.1" }, @@ -313,7 +310,6 @@ tests = [ { name = "django", specifier = "==5.2.8" }, { name = "django-stubs", extras = ["compatible-mypy", "oracle", "redis"], editable = "." }, { name = "jinja2", specifier = "==3.1.6" }, - { name = "mypy", specifier = "==1.19.0" }, { name = "mysqlclient", specifier = "==2.2.7" }, { name = "psycopg2-binary", specifier = "==2.9.11" }, { name = "pytest", specifier = "==9.0.1" },