Fix

Signed-off-by: Bernát Gábor <[email protected]> Signed-off-by: Bernát Gábor <[email protected]>
pypa · Dec 29, 2022 · ff5e08c · ff5e08c
1 parent 95a57f2
commit ff5e08c
Show file tree

Hide file tree

Showing 37 changed files with 398 additions and 419 deletions.
diff --git a/.coveragerc b/.coveragerc
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-### Thanks for contributing, make sure you address all the checklists (for details on how see [development documentation](https://virtualenv.pypa.io/en/latest/development.html#development))!
+### Thanks for contributing, make sure you address all the checklists (for details on how see [development documentation](https://virtualenv.pypa.io/en/latest/development.html#development))
 
 - [ ] ran the linter to address style issues (`tox -e fix_lint`)
 - [ ] wrote descriptive pull request text

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -22,37 +22,43 @@ jobs:
           - "3.9"
           - "3.8"
           - "3.7"
-          - "3.6"
           - pypy-3.9
           - pypy-3.8
           - pypy-3.7
         os:
           - ubuntu-20.04
           - macos-12
           - windows-2022
-        exclude:
-          - { os: macos-12, py: "pypy-3.6" } # PyPy 3.6 does not support macOS 11/12
         include:
           - { os: macos-12, py: "[email protected]" }
           - { os: macos-12, py: "[email protected]" }
     steps:
       - uses: taiki-e/install-action@cargo-binstall
       - name: Install OS dependencies
         run: |
+          set -x
           for i in 1 2 3; do
             echo "try $i" && \
             ${{ runner.os == 'Linux' && 'sudo apt-get update -y && sudo apt-get install snapd fish csh -y' || true }} && \
             ${{ runner.os == 'Linux' && 'cargo binstall -y nu' || true }} && \
             ${{ runner.os == 'macOS' && 'brew install fish tcsh nushell' || true }} && \
             ${{ runner.os == 'Windows' && 'choco install nushell' || true }} && \
             exit 0 || true;
+            sleep 1
           done
           exit 1
         shell: bash
       - name: Setup python for tox
         uses: actions/setup-python@v4
         with:
           python-version: "3.11"
+      - name: Install tox
+        run: python -m pip install tox pip -U
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Use local virtualenv for tox
+        run: python -m pip install .
       - name: Install Python 2 for cross test
         uses: actions/setup-python@v4
         with:
@@ -78,13 +84,6 @@ jobs:
           with Path(os.environ["GITHUB_ENV"]).open("ta") as file_handler:
               file_handler.write(env)
         shell: python
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install tox
-        run: python -m pip install tox
-      - name: Use local virtualenv for tox
-        run: python -m pip install .
       - name: Setup test suite
         run: tox -vv --notest
       - name: Run test suite

diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,6 @@ dist
 /pip-wheel-metadata
 /src/virtualenv/version.py
 /src/virtualenv/out
-venv*
 .python-version
 
 *wheel-store*

diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -0,0 +1,10 @@
+MD013:
+  code_blocks: false
+  headers: false
+  line_length: 120
+  tables: false
+
+MD046:
+  style: fenced
+no-emphasis-as-header: false
+first-line-h1: false
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,64 +1,81 @@
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
-  hooks:
-  - id: check-ast
-  - id: check-builtin-literals
-  - id: check-docstring-first
-  - id: check-merge-conflict
-  - id: check-yaml
-  - id: check-toml
-  - id: debug-statements
-  - id: end-of-file-fixer
-  - id: trailing-whitespace
-- repo: https://github.com/asottile/pyupgrade
-  rev: v3.2.1
-  hooks:
-  - id: pyupgrade
-    args: ["--py36-plus"]
-    exclude: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
-- repo: https://github.com/asottile/pyupgrade
-  rev: v2.38.4
-  hooks:
-  - id: pyupgrade
-    files: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
-- repo: https://github.com/PyCQA/isort
-  rev: 5.10.1
-  hooks:
-  - id: isort
-- repo: https://github.com/psf/black
-  rev: 22.10.0
-  hooks:
-  - id: black
-    args: [--safe]
-- repo: https://github.com/asottile/blacken-docs
-  rev: v1.12.1
-  hooks:
-  - id: blacken-docs
-    additional_dependencies: [black==22.10]
-- repo: https://github.com/pre-commit/pygrep-hooks
-  rev: v1.9.0
-  hooks:
-  - id: rst-backticks
-- repo: https://github.com/tox-dev/tox-ini-fmt
-  rev: "0.5.2"
-  hooks:
-  - id: tox-ini-fmt
-    args: ["-p", "fix_lint"]
-- repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v2.2.0
-  hooks:
-  - id: setup-cfg-fmt
-    args: [--min-py3-version, "3.6  ", "--max-py-version", "3.10"]
-- repo: https://github.com/PyCQA/flake8
-  rev: "5.0.4"
-  hooks:
-  - id: flake8
-    additional_dependencies:
-      - flake8-bugbear==22.10.27
-      - flake8-comprehensions==3.10.1
-      - flake8-pytest-style==1.6
-      - flake8-spellcheck==0.28
-      - flake8-unused-arguments==0.0.12
-      - flake8-noqa==1.3
-      - pep8-naming==0.13.2
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-ast
+      - id: check-builtin-literals
+      - id: check-docstring-first
+      - id: check-merge-conflict
+      - id: check-yaml
+      - id: check-toml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/asottile/add-trailing-comma
+    rev: v2.4.0
+    hooks:
+      - id: add-trailing-comma
+        args: [--py36-plus]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.2.1
+    hooks:
+      - id: pyupgrade
+        args: ["--py37-plus"]
+        exclude: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.38.4
+    hooks:
+      - id: pyupgrade
+        files: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.11.4
+    hooks:
+      - id: isort
+  - repo: https://github.com/psf/black
+    rev: 22.12.0
+    hooks:
+      - id: black
+        args: [--safe]
+  - repo: https://github.com/asottile/blacken-docs
+    rev: v1.12.1
+    hooks:
+      - id: blacken-docs
+        additional_dependencies: [black==22.12]
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.0
+    hooks:
+      - id: rst-backticks
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: "0.5.2"
+    hooks:
+      - id: tox-ini-fmt
+        args: ["-p", "fix"]
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          - flake8-bugbear==22.12.6
+          - flake8-comprehensions==3.10.1
+          - flake8-pytest-style==1.6
+          - flake8-spellcheck==0.28
+          - flake8-unused-arguments==0.0.12
+          - flake8-noqa==1.3
+          - pep8-naming==0.13.3
+          - flake8-pyproject==1.2.2
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v2.7.1"
+    hooks:
+      - id: prettier
+        additional_dependencies:
+          - [email protected]
+          - "@prettier/[email protected]"
+        args: ["--print-width=120", "--prose-wrap=always"]
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.32.2
+    hooks:
+      - id: markdownlint
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -1,64 +1,65 @@
 .wy-nav-content {
-    padding: 1em;
+  padding: 1em;
 }
 
 #virtualenv img {
-    margin-bottom: 6px;
+  margin-bottom: 6px;
 }
 
 /* Allow table content to wrap around */
-.wy-table-responsive table th, .wy-table-responsive table td {
-    /* !important because RTD has conflicting stylesheets */
-    white-space: normal !important;
-    padding: 8px 6px !important;
+.wy-table-responsive table th,
+.wy-table-responsive table td {
+  /* !important because RTD has conflicting stylesheets */
+  white-space: normal !important;
+  padding: 8px 6px !important;
 }
 
 .wy-table-responsive table {
-    width: 100%;
-    margin-left: 0 !important;
+  width: 100%;
+  margin-left: 0 !important;
 }
 
 .rst-content table.docutils td ol {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 .rst-content table.docutils td ul {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 .rst-content table.docutils td p {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 div[class*="highlight-"] {
-    margin-bottom: 12px;
+  margin-bottom: 12px;
 }
 
 /* Tweak whitespace on the release history page */
 #release-history p {
-    margin-bottom: 0;
-    margin-top: 0;
+  margin-bottom: 0;
+  margin-top: 0;
 }
 
 #release-history h3 {
-    margin-bottom: 6px;
+  margin-bottom: 6px;
 }
 
 #release-history ul {
-    margin-bottom: 12px;
+  margin-bottom: 12px;
 }
 
 #release-history ul ul {
-    margin-bottom: 0;
-    margin-top: 0;
+  margin-bottom: 0;
+  margin-top: 0;
 }
 
 #release-history h2 {
-    margin-bottom: 12px;
+  margin-bottom: 12px;
 }
 
 /* Reduce whitespace on the inline-code snippets and add softer corners */
 .rst-content code {
-    padding: 2px 3px;
-    border-radius: 3px;
+  padding: 2px 3px;
+  border-radius: 3px;
 }
diff --git a/docs/conf.py b/docs/conf.py
@@ -62,7 +62,7 @@ def generate_draft_news():
     new = subprocess.check_output(
         [sys.executable, "-m", "towncrier", "--draft", "--version", "NEXT"],
         cwd=root,
-        universal_newlines=True,
+        text=True,
     )
     dest = root / "docs" / "_draft.rst"
     dest.write_text("" if "No significant changes" in new else new)

diff --git a/docs/development.rst b/docs/development.rst
@@ -83,7 +83,7 @@ run:
 
 .. code-block:: console
 
-    tox -e fix_lint
+    tox -e fix
 
 .. note::