Fix the CI and bump setuptools

Signed-off-by: Bernát Gábor <[email protected]>
pypa · Oct 4, 2021 · 918212f · 918212f
1 parent 5d14665
commit 918212f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.28.0
+  rev: v2.29.0
   hooks:
   - id: pyupgrade
 - repo: https://github.com/PyCQA/isort

diff --git a/docs/changelog/2205.bugfix.rst b/docs/changelog/2205.bugfix.rst
@@ -0,0 +1 @@
+Upgrade embedded setuptools to ``58.2.0`` from ``58.1.0`` - by :user:`gaborbernat`.
diff --git a/setup.cfg b/setup.cfg
@@ -42,7 +42,7 @@ packages = find:
 install_requires =
     backports.entry_points_selectable>=1.0.4
     distlib>=0.3.1,<1
-    filelock>=3.0.0,<4
+    filelock>=3.2,<4
     platformdirs>=2,<3
     six>=1.9.0,<2   # keep it >=1.9.0 as it may cause problems on LTS platforms
     importlib-metadata>=0.12;python_version<"3.8"

diff --git a/src/virtualenv/report.py b/src/virtualenv/report.py
@@ -24,13 +24,9 @@ def setup_report(verbosity, show_pid=False):
         verbosity = MAX_LEVEL  # pragma: no cover
     level = LEVELS[verbosity]
     msg_format = "%(message)s"
-    filelock_logger = logging.getLogger("filelock")
     if level <= logging.DEBUG:
         locate = "module"
         msg_format = "%(relativeCreated)d {} [%(levelname)s %({})s:%(lineno)d]".format(msg_format, locate)
-        filelock_logger.setLevel(level)
-    else:
-        filelock_logger.setLevel(logging.WARN)
     if show_pid:
         msg_format = "[%(process)d] " + msg_format
     formatter = logging.Formatter(ensure_str(msg_format))

diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
@@ -7,27 +7,27 @@
 BUNDLE_SUPPORT = {
     "3.10": {
         "pip": "pip-21.2.4-py3-none-any.whl",
-        "setuptools": "setuptools-58.1.0-py3-none-any.whl",
+        "setuptools": "setuptools-58.2.0-py3-none-any.whl",
         "wheel": "wheel-0.37.0-py2.py3-none-any.whl",
     },
     "3.9": {
         "pip": "pip-21.2.4-py3-none-any.whl",
-        "setuptools": "setuptools-58.1.0-py3-none-any.whl",
+        "setuptools": "setuptools-58.2.0-py3-none-any.whl",
         "wheel": "wheel-0.37.0-py2.py3-none-any.whl",
     },
     "3.8": {
         "pip": "pip-21.2.4-py3-none-any.whl",
-        "setuptools": "setuptools-58.1.0-py3-none-any.whl",
+        "setuptools": "setuptools-58.2.0-py3-none-any.whl",
         "wheel": "wheel-0.37.0-py2.py3-none-any.whl",
     },
     "3.7": {
         "pip": "pip-21.2.4-py3-none-any.whl",
-        "setuptools": "setuptools-58.1.0-py3-none-any.whl",
+        "setuptools": "setuptools-58.2.0-py3-none-any.whl",
         "wheel": "wheel-0.37.0-py2.py3-none-any.whl",
     },
     "3.6": {
         "pip": "pip-21.2.4-py3-none-any.whl",
-        "setuptools": "setuptools-58.1.0-py3-none-any.whl",
+        "setuptools": "setuptools-58.2.0-py3-none-any.whl",
         "wheel": "wheel-0.37.0-py2.py3-none-any.whl",
     },
     "3.5": {

diff --git a/.../embed/setuptools-58.1.0-py3-none-any.whl → .../embed/setuptools-58.2.0-py3-none-any.whl b/.../embed/setuptools-58.1.0-py3-none-any.whl → .../embed/setuptools-58.2.0-py3-none-any.whl
diff --git a/tests/unit/discovery/py_info/test_py_info.py b/tests/unit/discovery/py_info/test_py_info.py
@@ -43,7 +43,7 @@ def test_bad_exe_py_info_no_raise(tmp_path, caplog, capsys, session_app_data):
     assert result is None
     out, _ = capsys.readouterr()
     assert not out
-    messages = [r.message for r in caplog.records if r.filename != "filelock.py"]
+    messages = [r.message for r in caplog.records if r.name != "filelock"]
     assert len(messages) == 2
     msg = messages[0]
     assert "get interpreter info via cmd: " in msg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Upgrade embedded setuptools to ``58.2.0`` from ``58.1.0`` - by :user:`gaborbernat`.