From 4e0e599051987d0442062515303f1ee0fe540de9 Mon Sep 17 00:00:00 2001 From: Peter Schutt Date: Mon, 16 Jan 2023 15:18:23 +1000 Subject: [PATCH] ci: pin deps Better to let dependabot manage these for us too. --- .github/workflows/ci.yml | 10 +++++----- requirements.ci.txt | 2 ++ dev.requirements.txt => requirements.dev.txt | 0 docs.requirements.txt => requirements.docs.txt | 0 tox.ini | 5 +++-- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 requirements.ci.txt rename dev.requirements.txt => requirements.dev.txt (100%) rename docs.requirements.txt => requirements.docs.txt (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d679d5b0..a288b8d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: with: python-version: ${{env.PYTHON_LATEST}} - name: Install Dependencies - run: python -m pip install --upgrade wheel tox==4.2.8 + run: python -m pip install --upgrade -r requirements.ci.txt - run: python -m tox -e pylint mypy: name: mypy @@ -55,7 +55,7 @@ jobs: with: python-version: ${{env.PYTHON_LATEST}} - name: Install Dependencies - run: python -m pip install --upgrade wheel tox==4.2.8 + run: python -m pip install --upgrade -r requirements.ci.txt - run: python -m tox -e mypy pyright: name: pyright @@ -77,7 +77,7 @@ jobs: with: python-version: ${{env.PYTHON_LATEST}} - name: Install Dependencies - run: python -m pip install --upgrade wheel tox==4.2.8 + run: python -m pip install --upgrade -r requirements.ci.txt - run: python -m tox -e pyright tests: name: tests on ${{matrix.python-version}} @@ -107,7 +107,7 @@ jobs: with: python-version: ${{matrix.python-version}} - name: Install Dependencies - run: python -m pip install --upgrade wheel tox==4.2.8 tox-gh-actions + run: python -m pip install --upgrade -r requirements.ci.txt tox-gh-actions - run: python -m tox - name: Upload Coverage Data uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # @v3.1.1 @@ -132,7 +132,7 @@ jobs: - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 #v4.4.0 with: python-version: ${{env.PYTHON_LATEST}} - - run: python -m pip install --upgrade wheel tox==4.2.8 + - run: python -m pip install --upgrade -r requirements.ci.txt - name: Download coverage data uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # @v3.0.1 with: diff --git a/requirements.ci.txt b/requirements.ci.txt new file mode 100644 index 00000000..b90d588d --- /dev/null +++ b/requirements.ci.txt @@ -0,0 +1,2 @@ +tox==4.3.1 +wheel==0.38.4 diff --git a/dev.requirements.txt b/requirements.dev.txt similarity index 100% rename from dev.requirements.txt rename to requirements.dev.txt diff --git a/docs.requirements.txt b/requirements.docs.txt similarity index 100% rename from docs.requirements.txt rename to requirements.docs.txt diff --git a/tox.ini b/tox.ini index 630c9bff..93c842a5 100644 --- a/tox.ini +++ b/tox.ini @@ -9,12 +9,13 @@ isolated_build = true [testenv] deps = - -r{toxinidir}/dev.requirements.txt + -r{toxinidir}/requirements.dev.txt commands = coverage run -p -m pytest {posargs} [testenv:pytest-plugin] +basepython = python3.11 commands = coverage run -p -m pytest tests/pytest_plugin {posargs} [testenv:coverage] @@ -77,6 +78,6 @@ basepython = python3.11 passenv = HOME deps = - -r{toxinidir}/docs.requirements.txt + -r{toxinidir}/requirements.docs.txt commands = mike {posargs: serve}