qkit 0.4.8__tar.gz → 0.4.9__tar.gz

{qkit-0.4.8 → qkit-0.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qkit
-Version: 0.4.8
+Version: 0.4.9
 Summary: qKIT quantum measurement suite in python
 Project-URL: Homepage, https://github.com/qkitgroup/qkit
 Project-URL: Bug Tracker, https://github.com/qkitgroup/qkit/issues
@@ -385,8 +385,8 @@ Description-Content-Type: text/markdown
 
 # Qkit - a quantum measurement suite in python
 
-[![PyPI - Version](https://img.shields.io/pypi/v/qkit-core.svg)](https://pypi.org/project/qkit-core)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qkit-core.svg)](https://pypi.org/project/qkit-core)
+[![PyPI - Version](https://img.shields.io/pypi/v/qkit.svg)](https://pypi.org/project/qkit)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qkit.svg)](https://pypi.org/project/qkit)
 
 ## Features:
   * a collection of ipython notebooks for measurement and data analysis tasks.
@@ -439,7 +439,7 @@ You have two choices, based on whether you want to modify `qkit` (development) o
 Create a virtual environment, as described above. Then use pip to install qkit:
 
 ```bash
-pip install qkit-core[jupyter,analysis]
+pip install qkit[jupyter,analysis]
 ```
 
 #### Install `qkit` for development

{qkit-0.4.8 → qkit-0.4.9}/README.md

@@ -5,8 +5,8 @@
 
 # Qkit - a quantum measurement suite in python
 
-[![PyPI - Version](https://img.shields.io/pypi/v/qkit-core.svg)](https://pypi.org/project/qkit-core)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qkit-core.svg)](https://pypi.org/project/qkit-core)
+[![PyPI - Version](https://img.shields.io/pypi/v/qkit.svg)](https://pypi.org/project/qkit)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qkit.svg)](https://pypi.org/project/qkit)
 
 ## Features:
   * a collection of ipython notebooks for measurement and data analysis tasks.
@@ -59,7 +59,7 @@ You have two choices, based on whether you want to modify `qkit` (development) o
 Create a virtual environment, as described above. Then use pip to install qkit:
 
 ```bash
-pip install qkit-core[jupyter,analysis]
+pip install qkit[jupyter,analysis]
 ```
 
 #### Install `qkit` for development

qkit-0.4.9/src/qkit/_version.py

@@ -0,0 +1 @@
+__version__ = "0.4.9"

{qkit-0.4.8 → qkit-0.4.9}/src/qkit/drivers/IVVI_BiasDAC.py

@@ -70,10 +70,10 @@ class IVVI_BiasDAC(Instrument):
         def __hash__(self):
             return hash(tuple((self.low, self.high)))
         def v2bytes(self, volt: float) -> tuple[int, int]:
-            if volt < self.low or volt > self.high:
+            bytevalue = round(65535*(volt - self.low)/(self.high - self.low))
+            if bytevalue < 0 or bytevalue > 65535:
                 raise ValueError
             else:
-                bytevalue = int(round(65535*(volt - self.low)/(self.high - self.low)))
                 return (bytevalue//256, bytevalue % 256)
         def bytes2v(self, byte_high: int, byte_low: int) -> float:
             # Correct readback expected, no value checking

{qkit-0.4.8 → qkit-0.4.9}/src/qkit/drivers/Yokogawa.py

@@ -1985,9 +1985,9 @@ class Yokogawa(Instrument):
         -------
         None
         '''
-        new = 'sweep mode: {:d}:\n'.format(self._sweep_mode) + ''.join(['\t    channel: {:d}\n'.format(channel) + ''.join(['\t\t{:s}: {!s}\n'.format(key_parameter, val_parameter) for key_parameter, val_parameter in self._defaults[self._sweep_mode][i].items()]) for i, channel in enumerate(self._sweep_channels)])
-        self.set_defaults.__func__.__doc__ = self.set_defaults.__func__.__doc__.replace(self._default_str, new)
-        self._default_str = new
+        #new = 'sweep mode: {:d}:\n'.format(self._sweep_mode) + ''.join(['\t    channel: {:d}\n'.format(channel) + ''.join(['\t\t{:s}: {!s}\n'.format(key_parameter, val_parameter) for key_parameter, val_parameter in self._defaults[self._sweep_mode][i].items()]) for i, channel in enumerate(self._sweep_channels)])
+        #self.set_defaults.__func__.__doc__ = self.set_defaults.__func__.__doc__.replace(self._default_str, new)
+        self._default_str = "Fix me"
         return
     
     def get_all(self, channel=1):

{qkit-0.4.8 → qkit-0.4.9}/src/qkit/install/install.py

@@ -47,8 +47,9 @@ def windows_admin_required(f: Callable) -> Callable:
 
 # Get binary path for installed command:
 def get_binary(name: str) -> Path:
-    import shutil
-    return str(Path(shutil.which(name, path=Path(sys.argv[0]).parent)).absolute())
+    candidate = (Path(sys.executable).parent / name).absolute()
+    assert candidate.exists(), f"'{name}' does not exist!"
+    return str(candidate)
 
 
 def copy_named_template(source_cache: Traversable, target_path: Path, target_name: str, human_readable: str | None = None):
@@ -97,17 +98,18 @@ UNIVERSAL_SCRIPTS: list[Callable[[Path], None]] = [create_base_structure]
 ##############################
 
 def windows_install_scripts(pwd: Path):
-    from qkit.install import windows
-    windows_script_files = files(windows)
     with open(pwd / "launch.bat", "w") as f:
-        f.write(f"{get_binary("jupyter")} lab --config=./jupyter_lab_config.py\r\n")
+        activate_path = get_binary('activate.bat')
+        jupyter_path = get_binary('jupyter')
+        f.write(f'CALL "{activate_path}"\r\n"{jupyter_path}" lab --config=./jupyter_lab_config.py\r\n')
 
 @windows_admin_required
 @optional("Associate .h5 files with Qviewkit. Modifies the Registry.")
 def windows_associate_h5(pwd: Path):
     import winreg
     # Create file type if it does not exist.
-    qviewkit_launch_command = f'"{get_binary("qviewkit")}" -f "%1"'
+    qviewkit_path = get_binary("qviewkit")
+    qviewkit_launch_command = f'"{qviewkit_path}" -f "%1"'
     try:
         base_key = winreg.OpenKey(winreg.HKEY_CLASSES_ROOT, r"qviewkit.h5")
         (value, type) = winreg.QueryValueEx(base_key, None)

qkit-0.4.8/src/qkit/_version.py

@@ -1 +0,0 @@
-__version__ = "0.4.8"