pyccapt 0.2.0__tar.gz → 0.2.1__tar.gz

{pyccapt-0.2.0/pyccapt.egg-info → pyccapt-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyccapt
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python package for atom probe control and data calibration.
 Home-page: https://github.com/mmonajem/pyccapt
 Author: Mehrpad Monajem
@@ -117,6 +117,19 @@ Requires-Dist: build; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: twine; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PyCCAPT
 

{pyccapt-0.2.0 → pyccapt-0.2.1}/pyccapt/__init__.py

@@ -1,3 +1,3 @@
 """Top-level package for PyCCAPT."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

{pyccapt-0.2.0 → pyccapt-0.2.1}/pyccapt/calibration/data_tools/ato_tools.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import struct
 from pathlib import Path
 

{pyccapt-0.2.0 → pyccapt-0.2.1}/pyccapt/control/apt/apt_exp_control.py

@@ -600,32 +600,43 @@ class APT_Exp_Control:
         self.variables.last_screen_shot = True
         validate_detector_data_lengths(self.variables, self.conf, self.log_apt)
 
-        self.variables.end_time = datetime.datetime.now().strftime("%d/%m/%Y %H:%M")
-        # save data in hdf5 file
-        hdf5_creator.hdf_creator(self.variables, self.conf, time_counter, time_ex)
-        # Adding results of the experiment to the log file
-        self.log_apt.info('Total number of Ions is: %s' % self.variables.total_ions)
-        self.log_apt.info('HDF5 file is created')
-
-
-        # save setup parameters and run statistics in a txt file
-        experiment_statistics.save_statistics_apt(self.variables, self.conf)
-
-        # send an email
-        if len(self.variables.email) > 3:
-            apt_exp_control_func.send_info_email(self.log_apt, self.variables)
-
-        # Save new value of experiment counter
-        counter_path = runtime.ensure_counter_file()
-        self.variables.counter += 1
-        counter_path.write_text(str(self.variables.counter), encoding="utf-8")
-        self.log_apt.info('Experiment counter is increased')
-
-        self.experiment_finished_event.set()
-        # Clear up all the variables and deinitialize devices
-        self.clear_up()
-        self.log_apt.info('Variables and devices are cleared and deinitialized')
-        self.variables.flag_end_experiment = True
+        try:
+            self.variables.end_time = datetime.datetime.now().strftime("%d/%m/%Y %H:%M")
+            # save data in hdf5 file
+            hdf5_creator.hdf_creator(self.variables, self.conf, time_counter, time_ex)
+            # Adding results of the experiment to the log file
+            self.log_apt.info('Total number of Ions is: %s' % self.variables.total_ions)
+            self.log_apt.info('HDF5 file is created')
+
+            # save setup parameters and run statistics in a txt file
+            experiment_statistics.save_statistics_apt(self.variables, self.conf)
+
+            # send an email
+            if len(self.variables.email) > 3:
+                apt_exp_control_func.send_info_email(self.log_apt, self.variables)
+
+            # Save new value of experiment counter
+            counter_path = runtime.ensure_counter_file()
+            self.variables.counter += 1
+            counter_path.write_text(str(self.variables.counter), encoding="utf-8")
+            self.log_apt.info('Experiment counter is increased')
+        except Exception as exc:
+            message = f'Experiment finalization failed: {exc.__class__.__name__}: {exc}'
+            print(message)
+            if self.log_apt is not None:
+                self.log_apt.exception(message)
+        finally:
+            try:
+                # Clear up all the variables and deinitialize devices
+                self.clear_up()
+                if self.log_apt is not None:
+                    self.log_apt.info('Variables and devices are cleared and deinitialized')
+            except Exception as exc:
+                print(f'Experiment cleanup failed: {exc.__class__.__name__}: {exc}')
+                if self.log_apt is not None:
+                    self.log_apt.exception('Experiment cleanup failed')
+            self.experiment_finished_event.set()
+            self.variables.flag_end_experiment = True
 
     def clear_up(self):
         """

{pyccapt-0.2.0 → pyccapt-0.2.1}/pyccapt/control/core/hdf5_creator.py

@@ -32,8 +32,47 @@ def _write_chunked_dataset(hdf_file, dataset_name: str, chunk_files: list[Path],
 		offset += chunk_size
 
 
+def _coerce_numeric_array(data, dtype):
+	target_dtype = np.dtype(dtype)
+	values = np.asarray(data)
+	needs_string_conversion = (
+		values.dtype.kind in {"U", "S", "O"}
+		and (
+			np.issubdtype(target_dtype, np.floating)
+			or np.issubdtype(target_dtype, np.integer)
+		)
+	)
+	if not needs_string_conversion:
+		return values.astype(target_dtype, copy=False)
+
+	def _normalize_string(value):
+		if isinstance(value, bytes):
+			value = value.decode("utf-8", errors="ignore")
+		text = str(value).strip()
+		return text
+
+	def _convert_value(value):
+		text = _normalize_string(value)
+		if not text or text.lower() in {"n/a", "nan", "none"}:
+			return np.nan if np.issubdtype(target_dtype, np.floating) else 0
+		try:
+			numeric_value = float(text)
+		except (TypeError, ValueError):
+			return np.nan if np.issubdtype(target_dtype, np.floating) else 0
+		if np.issubdtype(target_dtype, np.integer):
+			return int(numeric_value)
+		return numeric_value
+
+	if values.ndim == 0:
+		return np.asarray(_convert_value(values.item()), dtype=target_dtype)
+
+	flat_values = [_convert_value(value) for value in values.reshape(-1)]
+	return np.asarray(flat_values, dtype=target_dtype).reshape(values.shape)
+
+
 def _create_dataset(hdf_file, dataset_name: str, data, dtype) -> None:
-	hdf_file.create_dataset(dataset_name, data=np.asarray(data), dtype=dtype)
+	dataset_data = _coerce_numeric_array(data, dtype)
+	hdf_file.create_dataset(dataset_name, data=dataset_data, dtype=dtype)
 
 
 def _write_surface_concept_detector_data(hdf_file, variables) -> None:

{pyccapt-0.2.0 → pyccapt-0.2.1}/pyccapt/control/devices/initialize_devices.py

@@ -208,9 +208,9 @@ def initialize_pfeiffer_gauges(variables):
     """
     tpg = TPG362(port=variables.COM_PORT_gauge_mc)
     value, _ = tpg.pressure_gauge(2)
-    variables.vacuum_main = '{}'.format(value)
+    variables.vacuum_main = float(value)
     value, _ = tpg.pressure_gauge(1)
-    variables.vacuum_buffer = '{}'.format(value)
+    variables.vacuum_buffer = float(value)
 
 
 def state_update(conf, variables, emitter):
@@ -303,13 +303,13 @@ def state_update(conf, variables, emitter):
 
         start_time = time.time()
         log_time_time_interval = conf['log_time_time_interval']
-        vacuum_main = 'N/A'
-        vacuum_buffer = 'N/A'
-        vacuum_buffer_backing = 'N/A'
-        vacuum_load_lock = 'N/A'
-        vacuum_load_lock_backing = 'N/A'
-        vacuum_cryo_load_lock = 'N/A'
-        vacuum_cryo_load_lock_backing = 'N/A'
+        vacuum_main = -1.0
+        vacuum_buffer = -1.0
+        vacuum_buffer_backing = -1.0
+        vacuum_load_lock = -1.0
+        vacuum_load_lock_backing = -1.0
+        vacuum_cryo_load_lock = -1.0
+        vacuum_cryo_load_lock_backing = -1.0
         set_temperature_tmp_cryo = 0
         set_temperature_tmp_ll = 0
         while emitter.bool_flag_while_loop:
@@ -369,23 +369,24 @@ def state_update(conf, variables, emitter):
             if conf['COM_PORT_gauge_mc'] != "off" and tpg is not None:
                 value, _ = tpg.pressure_gauge(2)
                 try:
-                    vacuum_main = '{}'.format(value)
+                    vacuum_main = float(value)
                     clear_issue("vacuum_main")
                 except Exception as e:
                     report_once("vacuum_main", f"Error reading Temperature:{e}")
                     # Handle the case where response is not a valid float
-                    vacuum_main = -1
+                    vacuum_main = -1.0
                 variables.vacuum_main = vacuum_main
                 emitter.vacuum_main.emit(float(vacuum_main))
                 value, _ = tpg.pressure_gauge(1)
                 try:
-                    vacuum_buffer = '{}'.format(value)
+                    vacuum_buffer = float(value)
                     clear_issue("vacuum_buffer")
                 except Exception as e:
                     report_once("vacuum_buffer", f"Error reading BC:{e}")
                     tpg = None
                     # Handle the case where response is not a valid float
-                    vacuum_buffer = -1
+                    vacuum_buffer = -1.0
+                variables.vacuum_buffer = vacuum_buffer
                 emitter.vacuum_buffer.emit(float(vacuum_buffer))
             if conf['pump_ll'] != "off" and E_AGC_ll is not None:
                 response = command_edwards(conf, variables, 'pressure', E_AGC=E_AGC_ll, status='load_lock')

{pyccapt-0.2.0 → pyccapt-0.2.1}/pyccapt/control/tdc_surface_concept/scTDC.py

@@ -79,6 +79,7 @@ import os
 from pathlib import Path
 import time
 import traceback
+from contextlib import contextmanager
 
 try:  # most stuff works without numpy
     import numpy as np
@@ -304,6 +305,37 @@ def copy_statistics(s):
     return r
 
 
+@contextmanager
+def _vendor_runtime_environment(module_dir: Path):
+    old_cwd = Path.cwd()
+    dll_directory = None
+    set_dll_directory = None
+    if os.name == 'nt':
+        if hasattr(os, "add_dll_directory"):
+            dll_directory = os.add_dll_directory(str(module_dir))
+        try:
+            kernel32 = ctypes.windll.kernel32
+            kernel32.SetDllDirectoryW.argtypes = [ctypes.c_wchar_p]
+            kernel32.SetDllDirectoryW.restype = ctypes.c_bool
+            set_dll_directory = kernel32.SetDllDirectoryW
+            set_dll_directory(str(module_dir))
+        except Exception:
+            set_dll_directory = None
+
+    try:
+        os.chdir(module_dir)
+        yield
+    finally:
+        os.chdir(old_cwd)
+        if set_dll_directory is not None:
+            try:
+                set_dll_directory(None)
+            except Exception:
+                pass
+        if dll_directory is not None:
+            dll_directory.close()
+
+
 class scTDClib:
 
     def __init__(self):
@@ -313,9 +345,10 @@ class scTDClib:
         self._module_dir = Path(__file__).resolve().parent
 
         if os.name == 'nt':
-            self.lib = ctypes.WinDLL(str(self._module_dir / "scTDC1.dll"))
-            self.lib.sc_tdc_init_inifile.argtypes = [ctypes.c_char_p]
-            self.lib.sc_get_err_msg.argtypes = [ctypes.c_int, ctypes.c_char_p]
+            with _vendor_runtime_environment(self._module_dir):
+                self.lib = ctypes.WinDLL(str(self._module_dir / "scTDC1.dll"))
+                self.lib.sc_tdc_init_inifile.argtypes = [ctypes.c_char_p]
+                self.lib.sc_get_err_msg.argtypes = [ctypes.c_int, ctypes.c_char_p]
         else:
             self.lib = ctypes.CDLL("libscTDC.so.1")
         self.lib.sc_tdc_init_inifile.argtypes = [ctypes.c_char_p]
@@ -361,6 +394,9 @@ class scTDClib:
             candidate = self._module_dir / ini_path
             if candidate.exists():
                 ini_path = candidate
+        if os.name == 'nt':
+            with _vendor_runtime_environment(self._module_dir):
+                return self.lib.sc_tdc_init_inifile(str(ini_path).encode('utf-8'))
         return self.lib.sc_tdc_init_inifile(str(ini_path).encode('utf-8'))
 
     def sc_get_err_msg(self, errcode):
@@ -500,7 +536,8 @@ class scTDC_hdf5lib:
         """
         self._module_dir = Path(__file__).resolve().parent
         if os.name == 'nt':
-            self.lib = ctypes.WinDLL(str(self._module_dir / "scTDC_hdf50.dll"))
+            with _vendor_runtime_environment(self._module_dir):
+                self.lib = ctypes.WinDLL(str(self._module_dir / "scTDC_hdf50.dll"))
         else:
             self.lib = ctypes.CDLL("libscTDC_hdf5.so.0")
         l = self.lib

{pyccapt-0.2.0 → pyccapt-0.2.1/pyccapt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyccapt
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python package for atom probe control and data calibration.
 Home-page: https://github.com/mmonajem/pyccapt
 Author: Mehrpad Monajem
@@ -117,6 +117,19 @@ Requires-Dist: build; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: twine; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # PyCCAPT
 

{pyccapt-0.2.0 → pyccapt-0.2.1}/pyccapt.egg-info/SOURCES.txt

@@ -4,9 +4,6 @@ MANIFEST.in
 README.md
 pyproject.toml
 setup.py
-.eggs/pytest_runner-6.0.1-py3.12.egg/ptr/__init__.py
-.eggs/pytest_runner-6.0.1-py3.9.egg/ptr/__init__.py
-docs/conf.py
 pyccapt/__init__.py
 pyccapt/config.toml
 pyccapt.egg-info/PKG-INFO
@@ -69,18 +66,6 @@ pyccapt/calibration/reconstructions/rdf.py
 pyccapt/calibration/reconstructions/reconstruction.py
 pyccapt/calibration/reconstructions/rotation_tools.py
 pyccapt/calibration/reconstructions/sdm.py
-pyccapt/calibration/tutorials/__init__.py
-pyccapt/calibration/tutorials/tutorials_helpers/__init__.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_3d_reconstruction.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_calibration.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_data_loader.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_ion_list.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_ion_selection.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_mc_plot.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_special_crop.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_t_0_tune.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_temporal_crop.py
-pyccapt/calibration/tutorials/tutorials_helpers/helper_visualization.py
 pyccapt/control/CONTROL.md
 pyccapt/control/DATA_STRUCTURE.md
 pyccapt/control/__init__.py
@@ -110,54 +95,12 @@ pyccapt/control/devices/email_send.py
 pyccapt/control/devices/initialize_devices.py
 pyccapt/control/devices/pfeiffer_gauges.py
 pyccapt/control/devices/signal_generator.py
-pyccapt/control/devices_test/__init__.py
-pyccapt/control/devices_test/camera_1.py
-pyccapt/control/devices_test/camera_2.py
-pyccapt/control/devices_test/counter.py
-pyccapt/control/devices_test/daqami.py
-pyccapt/control/devices_test/drs.py
-pyccapt/control/devices_test/gates.py
-pyccapt/control/devices_test/lamp_usb_switch.py
-pyccapt/control/devices_test/laser_nkt_origami.py
-pyccapt/control/devices_test/serial_com_cryovac.py
-pyccapt/control/devices_test/serial_com_edwards.py
-pyccapt/control/devices_test/serial_com_pfeiffer.py
-pyccapt/control/devices_test/serial_com_v_dc.py
-pyccapt/control/devices_test/serial_com_v_p.py
-pyccapt/control/devices_test/serial_ports_list.py
-pyccapt/control/devices_test/siglent_signal_generator.py
-pyccapt/control/devices_test/tdc_roentec_t.py
-pyccapt/control/devices_test/tdc_surface_concept_t_1.py
-pyccapt/control/devices_test/tdc_surface_concept_t_2.py
-pyccapt/control/devices_test/tdc_surface_concept_t_3.py
-pyccapt/control/devices_test/thorlabs_controller.py
 pyccapt/control/drs/README.md
 pyccapt/control/drs/__init__.py
 pyccapt/control/drs/drs.py
 pyccapt/control/drs/drs_lib.dll
 pyccapt/control/drs/drs_lib.exp
 pyccapt/control/drs/drs_lib.lib
-pyccapt/control/drs/source/drs5_lib/include/DRS.h
-pyccapt/control/drs/source/drs5_lib/include/averager.h
-pyccapt/control/drs/source/drs5_lib/include/drs_exam.h
-pyccapt/control/drs/source/drs5_lib/include/libusb.h
-pyccapt/control/drs/source/drs5_lib/include/musbstd.h
-pyccapt/control/drs/source/drs5_lib/include/mxml.h
-pyccapt/control/drs/source/drs5_lib/include/strlcpy.h
-pyccapt/control/drs/source/drs5_lib/src/DRS.cpp
-pyccapt/control/drs/source/drs5_lib/src/averager.cpp
-pyccapt/control/drs/source/drs5_lib/src/drs_exam.cpp
-pyccapt/control/drs/source/drs5_lib/src/drs_ox.cpp
-pyccapt/control/drs/source/drs5_lib/src/musbstd.c
-pyccapt/control/drs/source/drs5_lib/src/mxml.c
-pyccapt/control/drs/source/drs5_lib/src/strlcpy.c
-pyccapt/control/drs/src/DRS.obj
-pyccapt/control/drs/src/averager.obj
-pyccapt/control/drs/src/drs_exam.obj
-pyccapt/control/drs/src/drs_ox.obj
-pyccapt/control/drs/src/musbstd.obj
-pyccapt/control/drs/src/mxml.obj
-pyccapt/control/drs/src/strlcpy.obj
 pyccapt/control/gui/__init__.py
 pyccapt/control/gui/gui_baking.py
 pyccapt/control/gui/gui_cameras.py
@@ -180,19 +123,10 @@ pyccapt/control/tdc_roentdek/global.cfg
 pyccapt/control/tdc_roentdek/tdc_roentdek.py
 pyccapt/control/tdc_roentdek/wrapper_read_TDC8HP_x64.dll
 pyccapt/control/tdc_roentdek/source/CoboldPC2011R5-2_Header-Template_1TDC8HP.lmf
-pyccapt/control/tdc_roentdek/source/LMF_IO.cpp
-pyccapt/control/tdc_roentdek/source/LMF_IO.h
 pyccapt/control/tdc_roentdek/source/global.cfg
 pyccapt/control/tdc_roentdek/source/hptdc_driver_3.5.2_x64.lib
 pyccapt/control/tdc_roentdek/source/hptdc_driver_3.5.2_x86.lib
 pyccapt/control/tdc_roentdek/source/lmf2txt.exe
-pyccapt/control/tdc_roentdek/source/simple_read_TDC8HP.sln
-pyccapt/control/tdc_roentdek/source/simple_read_TDC8HP.vcxproj
-pyccapt/control/tdc_roentdek/source/simple_read_TDC8HP.vcxproj.filters
-pyccapt/control/tdc_roentdek/source/simple_read_TDC8HP.vcxproj.user
-pyccapt/control/tdc_roentdek/source/simple_read_TDC8HP_grouped_LMF.zip
-pyccapt/control/tdc_roentdek/source/tdcmanager.h
-pyccapt/control/tdc_roentdek/source/wrapper_read_TDC8HP.cpp
 pyccapt/control/tdc_surface_concept/README.md
 pyccapt/control/tdc_surface_concept/__init__.py
 pyccapt/control/tdc_surface_concept/okFrontPanel.dll
@@ -208,7 +142,6 @@ pyccapt/control/tdc_surface_concept/tdc_surface_concept.py
 pyccapt/control/thorlabs_apt/APT Server.chm
 pyccapt/control/thorlabs_apt/APT.dll
 pyccapt/control/thorlabs_apt/APT.lib
-pyccapt/control/thorlabs_apt/APTAPI.h
 pyccapt/control/thorlabs_apt/APTChopper.ocx
 pyccapt/control/thorlabs_apt/APTLaser.ocx
 pyccapt/control/thorlabs_apt/APTPZMotor.ocx
@@ -234,7 +167,6 @@ pyccapt/control/thorlabs_apt/thorlab_motor.py
 pyccapt/control/usb_switch/USBaccessX64.dll
 pyccapt/control/usb_switch/__init__.py
 pyccapt/control/usb_switch/usb_switch.py
-pyccapt/files/IonenlisteAPT.xlsx
 pyccapt/files/arrow.png
 pyccapt/files/close_all.png
 pyccapt/files/color_scheme.h5
@@ -261,5 +193,4 @@ pyccapt/files/PyQt6_UI/gui_laser_control_special.ui
 pyccapt/files/PyQt6_UI/gui_main.ui
 pyccapt/files/PyQt6_UI/gui_pumps_vacuum.ui
 pyccapt/files/PyQt6_UI/gui_stage_control.ui
-pyccapt/files/PyQt6_UI/gui_visualization.ui
-tests/__init__.py
+pyccapt/files/PyQt6_UI/gui_visualization.ui

pyccapt-0.2.0/.eggs/pytest_runner-6.0.1-py3.12.egg/ptr/__init__.py

@@ -1,216 +0,0 @@
-"""
-Implementation
-"""
-
-import os as _os
-import shlex as _shlex
-import contextlib as _contextlib
-import sys as _sys
-import operator as _operator
-import itertools as _itertools
-import warnings as _warnings
-
-import pkg_resources
-import setuptools.command.test as orig
-from setuptools import Distribution
-
-
-@_contextlib.contextmanager
-def _save_argv(repl=None):
-    saved = _sys.argv[:]
-    if repl is not None:
-        _sys.argv[:] = repl
-    try:
-        yield saved
-    finally:
-        _sys.argv[:] = saved
-
-
-class CustomizedDist(Distribution):
-
-    allow_hosts = None
-    index_url = None
-
-    def fetch_build_egg(self, req):
-        """Specialized version of Distribution.fetch_build_egg
-        that respects respects allow_hosts and index_url."""
-        from setuptools.command.easy_install import easy_install
-
-        dist = Distribution({'script_args': ['easy_install']})
-        dist.parse_config_files()
-        opts = dist.get_option_dict('easy_install')
-        keep = (
-            'find_links',
-            'site_dirs',
-            'index_url',
-            'optimize',
-            'site_dirs',
-            'allow_hosts',
-        )
-        for key in list(opts):
-            if key not in keep:
-                del opts[key]  # don't use any other settings
-        if self.dependency_links:
-            links = self.dependency_links[:]
-            if 'find_links' in opts:
-                links = opts['find_links'][1].split() + links
-            opts['find_links'] = ('setup', links)
-        if self.allow_hosts:
-            opts['allow_hosts'] = ('test', self.allow_hosts)
-        if self.index_url:
-            opts['index_url'] = ('test', self.index_url)
-        install_dir_func = getattr(self, 'get_egg_cache_dir', _os.getcwd)
-        install_dir = install_dir_func()
-        cmd = easy_install(
-            dist,
-            args=["x"],
-            install_dir=install_dir,
-            exclude_scripts=True,
-            always_copy=False,
-            build_directory=None,
-            editable=False,
-            upgrade=False,
-            multi_version=True,
-            no_report=True,
-            user=False,
-        )
-        cmd.ensure_finalized()
-        return cmd.easy_install(req)
-
-
-class PyTest(orig.test):
-    """
-    >>> import setuptools
-    >>> dist = setuptools.Distribution()
-    >>> cmd = PyTest(dist)
-    """
-
-    user_options = [
-        ('extras', None, "Install (all) setuptools extras when running tests"),
-        (
-            'index-url=',
-            None,
-            "Specify an index url from which to retrieve dependencies",
-        ),
-        (
-            'allow-hosts=',
-            None,
-            "Whitelist of comma-separated hosts to allow "
-            "when retrieving dependencies",
-        ),
-        (
-            'addopts=',
-            None,
-            "Additional options to be passed verbatim to the pytest runner",
-        ),
-    ]
-
-    def initialize_options(self):
-        self.extras = False
-        self.index_url = None
-        self.allow_hosts = None
-        self.addopts = []
-        self.ensure_setuptools_version()
-
-    @staticmethod
-    def ensure_setuptools_version():
-        """
-        Due to the fact that pytest-runner is often required (via
-        setup-requires directive) by toolchains that never invoke
-        it (i.e. they're only installing the package, not testing it),
-        instead of declaring the dependency in the package
-        metadata, assert the requirement at run time.
-        """
-        pkg_resources.require('setuptools>=27.3')
-
-    def finalize_options(self):
-        if self.addopts:
-            self.addopts = _shlex.split(self.addopts)
-
-    @staticmethod
-    def marker_passes(marker):
-        """
-        Given an environment marker, return True if the marker is valid
-        and matches this environment.
-        """
-        return (
-            not marker
-            or not pkg_resources.invalid_marker(marker)
-            and pkg_resources.evaluate_marker(marker)
-        )
-
-    def install_dists(self, dist):
-        """
-        Extend install_dists to include extras support
-        """
-        return _itertools.chain(
-            orig.test.install_dists(dist), self.install_extra_dists(dist)
-        )
-
-    def install_extra_dists(self, dist):
-        """
-        Install extras that are indicated by markers or
-        install all extras if '--extras' is indicated.
-        """
-        extras_require = dist.extras_require or {}
-
-        spec_extras = (
-            (spec.partition(':'), reqs) for spec, reqs in extras_require.items()
-        )
-        matching_extras = (
-            reqs
-            for (name, sep, marker), reqs in spec_extras
-            # include unnamed extras or all if self.extras indicated
-            if (not name or self.extras)
-            # never include extras that fail to pass marker eval
-            and self.marker_passes(marker)
-        )
-        results = list(map(dist.fetch_build_eggs, matching_extras))
-        return _itertools.chain.from_iterable(results)
-
-    @staticmethod
-    def _warn_old_setuptools():
-        msg = (
-            "pytest-runner will stop working on this version of setuptools; "
-            "please upgrade to setuptools 30.4 or later or pin to "
-            "pytest-runner < 5."
-        )
-        ver_str = pkg_resources.get_distribution('setuptools').version
-        ver = pkg_resources.parse_version(ver_str)
-        if ver < pkg_resources.parse_version('30.4'):
-            _warnings.warn(msg)
-
-    def run(self):
-        """
-        Override run to ensure requirements are available in this session (but
-        don't install them anywhere).
-        """
-        self._warn_old_setuptools()
-        dist = CustomizedDist()
-        for attr in 'allow_hosts index_url'.split():
-            setattr(dist, attr, getattr(self, attr))
-        for attr in (
-            'dependency_links install_requires tests_require extras_require '
-        ).split():
-            setattr(dist, attr, getattr(self.distribution, attr))
-        installed_dists = self.install_dists(dist)
-        if self.dry_run:
-            self.announce('skipping tests (dry run)')
-            return
-        paths = map(_operator.attrgetter('location'), installed_dists)
-        with self.paths_on_pythonpath(paths):
-            with self.project_on_sys_path():
-                return self.run_tests()
-
-    @property
-    def _argv(self):
-        return ['pytest'] + self.addopts
-
-    def run_tests(self):
-        """
-        Invoke pytest, replacing argv. Return result code.
-        """
-        with _save_argv(_sys.argv[:1] + self.addopts):
-            result_code = __import__('pytest').main()
-            if result_code:
-                raise SystemExit(result_code)