diff options
author | Bernát Gábor <bgabor8@bloomberg.net> | 2021-10-04 09:33:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-04 09:33:52 +0100 |
commit | fa16e0a98b7056c7090c8697239b137c41b8e993 (patch) | |
tree | a08ba951819ab6df33c187935689bfa5dc937ad8 | |
parent | 5d14665444460a01ff81c28ab74dd86864b2773c (diff) | |
download | virtualenv-fa16e0a98b7056c7090c8697239b137c41b8e993.tar.gz |
Fix the CI and bump setuptools (#2205)
-rw-r--r-- | .pre-commit-config.yaml | 2 | ||||
-rw-r--r-- | codecov.yml | 6 | ||||
-rw-r--r-- | docs/changelog/2205.bugfix.rst | 1 | ||||
-rw-r--r-- | setup.cfg | 2 | ||||
-rw-r--r-- | src/virtualenv/report.py | 4 | ||||
-rw-r--r-- | src/virtualenv/seed/wheels/embed/__init__.py | 10 | ||||
-rw-r--r-- | src/virtualenv/seed/wheels/embed/setuptools-58.2.0-py3-none-any.whl (renamed from src/virtualenv/seed/wheels/embed/setuptools-58.1.0-py3-none-any.whl) | bin | 816725 -> 946134 bytes | |||
-rw-r--r-- | tests/unit/discovery/py_info/test_py_info.py | 2 |
8 files changed, 15 insertions, 12 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 84d563e..2a8b0f9 100644 --- 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/codecov.yml b/codecov.yml new file mode 100644 index 0000000..5f91842 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,6 @@ +coverage: + status: + patch: + default: + informational: true +comment: false diff --git a/docs/changelog/2205.bugfix.rst b/docs/changelog/2205.bugfix.rst new file mode 100644 index 0000000..90659d1 --- /dev/null +++ b/docs/changelog/2205.bugfix.rst @@ -0,0 +1 @@ +Upgrade embedded setuptools to ``58.2.0`` from ``58.1.0`` - by :user:`gaborbernat`. @@ -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 index 665b293..2a2954f 100644 --- 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 index feb8031..f9d23ec 100644 --- a/src/virtualenv/seed/wheels/embed/__init__.py +++ b/src/virtualenv/seed/wheels/embed/__init__.py @@ -7,27 +7,27 @@ BUNDLE_FOLDER = Path(__file__).absolute().parent 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/src/virtualenv/seed/wheels/embed/setuptools-58.1.0-py3-none-any.whl b/src/virtualenv/seed/wheels/embed/setuptools-58.2.0-py3-none-any.whl Binary files differindex 18c8c22..a01c097 100644 --- a/src/virtualenv/seed/wheels/embed/setuptools-58.1.0-py3-none-any.whl +++ b/src/virtualenv/seed/wheels/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 index 7810cfa..a0b160c 100644 --- 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 |