summaryrefslogtreecommitdiff
path: root/src/virtualenv
diff options
context:
space:
mode:
authorBernát Gábor <gaborjbernat@gmail.com>2022-12-29 20:25:07 -0800
committerGitHub <noreply@github.com>2022-12-29 20:25:07 -0800
commite7fa1c2b4bbbe7495077e5f2146dca9c369b08d7 (patch)
tree4262eb520549529a7f5275e82fdf4cb4baf593aa /src/virtualenv
parent95a57f2ab796c22ab8c0644ba6f9334fe5d5ca67 (diff)
downloadvirtualenv-e7fa1c2b4bbbe7495077e5f2146dca9c369b08d7.tar.gz
Move to hatchling, drop 3.6 support (#2474)
Diffstat (limited to 'src/virtualenv')
-rw-r--r--src/virtualenv/activation/activator.py2
-rw-r--r--src/virtualenv/activation/via_template.py7
-rw-r--r--src/virtualenv/app_data/base.py12
-rw-r--r--src/virtualenv/create/creator.py6
-rw-r--r--src/virtualenv/create/via_global_ref/builtin/cpython/mac_os.py6
-rw-r--r--src/virtualenv/create/via_global_ref/builtin/ref.py2
-rw-r--r--src/virtualenv/create/via_global_ref/builtin/via_global_self_do.py6
-rw-r--r--src/virtualenv/discovery/windows/__init__.py3
-rw-r--r--src/virtualenv/seed/embed/via_app_data/pip_install/base.py4
-rw-r--r--src/virtualenv/seed/seeder.py2
-rw-r--r--src/virtualenv/seed/wheels/embed/__init__.py7
-rw-r--r--src/virtualenv/util/lock.py6
12 files changed, 35 insertions, 28 deletions
diff --git a/src/virtualenv/activation/activator.py b/src/virtualenv/activation/activator.py
index 99f2803..10b1cf7 100644
--- a/src/virtualenv/activation/activator.py
+++ b/src/virtualenv/activation/activator.py
@@ -31,7 +31,7 @@ class Activator(metaclass=ABCMeta):
"""
@abstractmethod
- def generate(self, creator): # noqa: U100
+ def generate(self, creator):
"""Generate activate script for the given creator.
:param creator: the creator (based of :class:`virtualenv.create.creator.Creator`) we used to create this \
diff --git a/src/virtualenv/activation/via_template.py b/src/virtualenv/activation/via_template.py
index f1eef53..069d52e 100644
--- a/src/virtualenv/activation/via_template.py
+++ b/src/virtualenv/activation/via_template.py
@@ -4,11 +4,8 @@ from abc import ABCMeta, abstractmethod
from .activator import Activator
-if sys.version_info >= (3, 10) or sys.version_info <= (3, 7):
- if sys.version_info >= (3, 10):
- from importlib.resources import files
- else:
- from importlib_resources import files
+if sys.version_info >= (3, 10):
+ from importlib.resources import files
def read_binary(module_name: str, filename: str) -> bytes:
return (files(module_name) / filename).read_bytes()
diff --git a/src/virtualenv/app_data/base.py b/src/virtualenv/app_data/base.py
index ecaee78..bc28b23 100644
--- a/src/virtualenv/app_data/base.py
+++ b/src/virtualenv/app_data/base.py
@@ -20,7 +20,7 @@ class AppData(metaclass=ABCMeta):
"""called when the user passes in the reset app data"""
@abstractmethod
- def py_info(self, path): # noqa: U100
+ def py_info(self, path):
raise NotImplementedError
@abstractmethod
@@ -32,7 +32,7 @@ class AppData(metaclass=ABCMeta):
raise NotImplementedError
@abstractmethod
- def embed_update_log(self, distribution, for_py_version): # noqa: U100
+ def embed_update_log(self, distribution, for_py_version):
raise NotImplementedError
@property
@@ -44,7 +44,7 @@ class AppData(metaclass=ABCMeta):
raise NotImplementedError
@abstractmethod
- def wheel_image(self, for_py_version, name): # noqa: U100
+ def wheel_image(self, for_py_version, name):
raise NotImplementedError
@contextmanager
@@ -58,12 +58,12 @@ class AppData(metaclass=ABCMeta):
@abstractmethod
@contextmanager
- def extract(self, path, to_folder): # noqa: U100
+ def extract(self, path, to_folder):
raise NotImplementedError
@abstractmethod
@contextmanager
- def locked(self, path): # noqa: U100
+ def locked(self, path):
raise NotImplementedError
@@ -77,7 +77,7 @@ class ContentStore(metaclass=ABCMeta):
raise NotImplementedError
@abstractmethod
- def write(self, content): # noqa: U100
+ def write(self, content):
raise NotImplementedError
@abstractmethod
diff --git a/src/virtualenv/create/creator.py b/src/virtualenv/create/creator.py
index 5ea6abe..a973264 100644
--- a/src/virtualenv/create/creator.py
+++ b/src/virtualenv/create/creator.py
@@ -128,11 +128,7 @@ class Creator(metaclass=ABCMeta):
value = Path(raw_value)
if value.exists() and value.is_file():
raise ArgumentTypeError(f"the destination {value} already exists and is a file")
- if sys.version_info <= (3, 6):
- # pre 3.6 resolve is always strict, aka must exists, sidestep by using os.path operation
- dest = Path(os.path.realpath(raw_value))
- else:
- dest = Path(os.path.abspath(str(value))).resolve() # on Windows absolute does not imply resolve so use both
+ dest = Path(os.path.abspath(str(value))).resolve() # on Windows absolute does not imply resolve so use both
value = dest
while dest:
if dest.exists():
diff --git a/src/virtualenv/create/via_global_ref/builtin/cpython/mac_os.py b/src/virtualenv/create/via_global_ref/builtin/cpython/mac_os.py
index 9fc2550..d23f53b 100644
--- a/src/virtualenv/create/via_global_ref/builtin/cpython/mac_os.py
+++ b/src/virtualenv/create/via_global_ref/builtin/cpython/mac_os.py
@@ -7,7 +7,11 @@ from abc import ABCMeta, abstractmethod
from pathlib import Path
from textwrap import dedent
-from virtualenv.create.via_global_ref.builtin.ref import ExePathRefToDest, PathRefToDest, RefMust
+from virtualenv.create.via_global_ref.builtin.ref import (
+ ExePathRefToDest,
+ PathRefToDest,
+ RefMust,
+)
from virtualenv.info import IS_MAC_ARM64
from .common import CPython, CPythonPosix, is_mac_os_framework
diff --git a/src/virtualenv/create/via_global_ref/builtin/ref.py b/src/virtualenv/create/via_global_ref/builtin/ref.py
index 60d97b3..fb1cf2e 100644
--- a/src/virtualenv/create/via_global_ref/builtin/ref.py
+++ b/src/virtualenv/create/via_global_ref/builtin/ref.py
@@ -78,7 +78,7 @@ class PathRef(metaclass=ABCMeta):
return self._can_symlink
@abstractmethod
- def run(self, creator, symlinks): # noqa: U100
+ def run(self, creator, symlinks):
raise NotImplementedError
def method(self, symlinks):
diff --git a/src/virtualenv/create/via_global_ref/builtin/via_global_self_do.py b/src/virtualenv/create/via_global_ref/builtin/via_global_self_do.py
index d00ee45..d57235c 100644
--- a/src/virtualenv/create/via_global_ref/builtin/via_global_self_do.py
+++ b/src/virtualenv/create/via_global_ref/builtin/via_global_self_do.py
@@ -1,6 +1,10 @@
from abc import ABCMeta
-from virtualenv.create.via_global_ref.builtin.ref import ExePathRefToDest, RefMust, RefWhen
+from virtualenv.create.via_global_ref.builtin.ref import (
+ ExePathRefToDest,
+ RefMust,
+ RefWhen,
+)
from virtualenv.util.path import ensure_dir
from ..api import ViaGlobalRefApi, ViaGlobalRefMeta
diff --git a/src/virtualenv/discovery/windows/__init__.py b/src/virtualenv/discovery/windows/__init__.py
index 4663a3a..71d82ce 100644
--- a/src/virtualenv/discovery/windows/__init__.py
+++ b/src/virtualenv/discovery/windows/__init__.py
@@ -14,7 +14,8 @@ def propose_interpreters(spec, cache_dir, env):
# and prefer PythonCore over conda pythons (as virtualenv is mostly used by non conda tools)
existing = list(discover_pythons())
existing.sort(
- key=lambda i: tuple(-1 if j is None else j for j in i[1:4]) + (1 if i[0] == "PythonCore" else 0,), reverse=True
+ key=lambda i: tuple(-1 if j is None else j for j in i[1:4]) + (1 if i[0] == "PythonCore" else 0,),
+ reverse=True,
)
for name, major, minor, arch, exe, _ in existing:
diff --git a/src/virtualenv/seed/embed/via_app_data/pip_install/base.py b/src/virtualenv/seed/embed/via_app_data/pip_install/base.py
index 0640929..3c44b77 100644
--- a/src/virtualenv/seed/embed/via_app_data/pip_install/base.py
+++ b/src/virtualenv/seed/embed/via_app_data/pip_install/base.py
@@ -23,7 +23,7 @@ class PipInstall(metaclass=ABCMeta):
self._console_entry_points = None
@abstractmethod
- def _sync(self, src, dst): # noqa: U100
+ def _sync(self, src, dst):
raise NotImplementedError
def install(self, version_info):
@@ -108,7 +108,7 @@ class PipInstall(metaclass=ABCMeta):
return self.__dist_info
@abstractmethod
- def _fix_records(self, extra_record_data): # noqa: U100
+ def _fix_records(self, extra_record_data):
raise NotImplementedError
@property
diff --git a/src/virtualenv/seed/seeder.py b/src/virtualenv/seed/seeder.py
index 0d26bd0..d06d1a0 100644
--- a/src/virtualenv/seed/seeder.py
+++ b/src/virtualenv/seed/seeder.py
@@ -25,7 +25,7 @@ class Seeder(metaclass=ABCMeta):
raise NotImplementedError
@abstractmethod
- def run(self, creator): # noqa: U100
+ def run(self, creator):
"""Perform the seed operation.
:param creator: the creator (based of :class:`virtualenv.create.creator.Creator`) we used to create this \
diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
index 4d3108e..5e87f75 100644
--- a/src/virtualenv/seed/wheels/embed/__init__.py
+++ b/src/virtualenv/seed/wheels/embed/__init__.py
@@ -4,6 +4,11 @@ from virtualenv.seed.wheels.util import Wheel
BUNDLE_FOLDER = Path(__file__).absolute().parent
BUNDLE_SUPPORT = {
+ "3.12": {
+ "pip": "pip-22.3.1-py3-none-any.whl",
+ "setuptools": "setuptools-65.6.3-py3-none-any.whl",
+ "wheel": "wheel-0.38.4-py3-none-any.whl",
+ },
"3.11": {
"pip": "pip-22.3.1-py3-none-any.whl",
"setuptools": "setuptools-65.6.3-py3-none-any.whl",
@@ -45,7 +50,7 @@ BUNDLE_SUPPORT = {
"wheel": "wheel-0.37.1-py2.py3-none-any.whl",
},
}
-MAX = "3.11"
+MAX = "3.12"
def get_embed_wheel(distribution, for_py_version):
diff --git a/src/virtualenv/util/lock.py b/src/virtualenv/util/lock.py
index 512d1c9..8d7215e 100644
--- a/src/virtualenv/util/lock.py
+++ b/src/virtualenv/util/lock.py
@@ -58,17 +58,17 @@ class PathLockBase(metaclass=ABCMeta):
raise NotImplementedError
@abstractmethod
- def __exit__(self, exc_type, exc_val, exc_tb): # noqa: U100
+ def __exit__(self, exc_type, exc_val, exc_tb):
raise NotImplementedError
@abstractmethod
@contextmanager
- def lock_for_key(self, name, no_block=False): # noqa: U100
+ def lock_for_key(self, name, no_block=False):
raise NotImplementedError
@abstractmethod
@contextmanager
- def non_reentrant_lock_for_key(self, name): # noqa: U100
+ def non_reentrant_lock_for_key(self, name):
raise NotImplementedError