diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 5a7324b..db8ab06 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -47,7 +47,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv + python -m pip install --upgrade tox virtualenv!=20.16.0 - name: "Run mypy" if: steps.changes.outputs.code == 'true' diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index ecf3a69..d2b981f 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -33,7 +33,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7.1,8.0,8.1},build", experimental: False} - - {python-version: "3.11.0-beta.3", testenvs: "py311-dev-click{7.1,8.0,8.1},build", experimental: True} + - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-click{7.1,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-click{7.1,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-click{7.1,8.0,8.1},build", experimental: True} @@ -66,7 +66,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv + python -m pip install --upgrade tox virtualenv!=20.16.0 - name: "Run Tests for Python ${{ matrix.config.python-version }}" if: steps.setup-python.outcome == 'success' diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index f9ba50c..c8181e5 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7.1,8.0,8.1},build", experimental: False} - - {python-version: "3.11.0-beta.3", testenvs: "py311-dev-click{7.1,8.0,8.1},build", experimental: True} + - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-click{7.1,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-click{7.1,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-click{7.1,8.0,8.1},build", experimental: True} @@ -67,7 +67,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv + python -m pip install --upgrade tox virtualenv!=20.16.0 python -m pip install --upgrade coverage_pyver_pragma - name: "Run Tests for Python ${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 963ac36..b481a76 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-beta.3,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -33,7 +33,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-click{7.1,8.0,8.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-click{7.1,8.0,8.1},build", experimental: False} - - {python-version: "3.11.0-beta.3", testenvs: "py311-dev-click{7.1,8.0,8.1},build", experimental: True} + - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-click{7.1,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-click{7.1,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-click{7.1,8.0,8.1},build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39-click{7.1,8.0,8.1}", experimental: True} @@ -65,7 +65,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv + python -m pip install --upgrade tox virtualenv!=20.16.0 - name: "Run Tests for Python ${{ matrix.config.python-version }}" if: steps.setup-python.outcome == 'success' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b3cbe16..ff849f6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ exclude: ^$ repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.6.1 + rev: v0.7.0 hooks: - id: reformat-pyproject @@ -30,7 +30,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/domdfcoding/pre-commit-hooks - rev: v0.3.0 + rev: v0.4.0 hooks: - id: requirements-txt-sorter args: @@ -40,13 +40,13 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.2.1 + rev: v0.2.2 hooks: - id: ensure-dunder-all files: ^consolekit/.*\.py$ - repo: https://github.com/domdfcoding/flake2lint - rev: v0.4.1 + rev: v0.4.2 hooks: - id: flake2lint @@ -84,7 +84,7 @@ repos: exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - repo: https://github.com/domdfcoding/dep_checker - rev: v0.6.2 + rev: v0.7.0 hooks: - id: dep_checker args: diff --git a/doc-source/conf.py b/doc-source/conf.py index e2394e9..5087c40 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -27,7 +27,8 @@ slug = re.sub(r'\W+', '-', project.lower()) release = version = config.version -todo_include_todos = bool(os.environ.get("SHOW_TODOS", 0)) +sphinx_builder = os.environ.get("SPHINX_BUILDER", "html").lower() +todo_include_todos = int(os.environ.get("SHOW_TODOS", 0)) and sphinx_builder != "latex" intersphinx_mapping = { "python": ("https://docs.python.org/3/", None), diff --git a/tox.ini b/tox.ini index c5ae1e6..b352927 100644 --- a/tox.ini +++ b/tox.ini @@ -31,8 +31,9 @@ envlist = skip_missing_interpreters = True isolated_build = True requires = - pip>=21 + pip>=21,!=22.2 tox-envlist>=0.2.1 + virtualenv!=20.16.0 [envlists] test = @@ -51,6 +52,7 @@ cov = py36-click7.1, coverage [testenv:docs] setenv = SHOW_TODOS = 1 +passenv = SPHINX_BUILDER basepython = python3.8 changedir = {toxinidir}/doc-source extras = all @@ -75,15 +77,15 @@ changedir = {toxinidir} ignore_errors = True skip_install = False deps = - flake8>=3.8.2 + flake8>=3.8.2,<5 flake8-2020>=1.6.0 flake8-builtins>=1.5.3 flake8-docstrings>=1.5.0 flake8-dunder-all>=0.1.1 flake8-encodings>=0.1.0 flake8-github-actions>=0.1.0 - flake8-noqa>=1.1.0 - flake8-pyi>=20.10.0 + flake8-noqa>=1.1.0,<=1.2.2 + flake8-pyi>=20.10.0,<=22.8.0 flake8-pytest-style>=1.3.0 flake8-quotes>=3.3.0 flake8-slots>=0.1.0