Merge pull request #5 from SweepMe/driver-migration

Driver migration

.github/Test-Importability.ps1

@@ -0,0 +1,28 @@
+$ErrorActionPreference = "Stop"
+
+[Ref]$Imports = 0
+[Ref]$SuccessfulImports = 0
+
+function Import-Driver {
+    Param(
+        [Parameter(Mandatory)]
+        [string]$DriverName
+    )
+    $Imports.Value++
+    python ./tests/importability/import_driver.py $DriverName
+    if ($?) {
+        $SuccessfulImports.Value++
+    }
+}
+
+Get-ChildItem -Path src -Attributes Directory | % { Import-Driver -DriverName $_.name }
+
+if ($SuccessfulImports.Value -ne $Imports.Value)
+{
+    Throw "Only $($SuccessfulImports.Value) out of $($Imports.Value) imports were successful."
+}
+
+if ($SuccessfulImports.Value -eq 0)
+{
+    Throw "Could not import any drivers."
+}

.gitignore

@@ -154,17 +154,19 @@ cython_debug/
 
 .idea/
 
-# info.ini will be written (and updated) by SweepMe! on every start
+# info.ini and run.ini will be generated by server or
+# written (and updated) by SweepMe! on every start
 # and we don't want that in the repository because it's not an actual change
 /src/*/info.ini
+/src/*/run.ini
 
 # Instrument drivers can ship with libraries, they need to be complete and may
 # contain any files that have been excluded previously.
 # This section must be last in the .gitignore
 !/src/*/libs/**
-!/src/*/libs_39_32/**
-!/src/*/libs_39_64/**
+!/src/*/libraries/libs_39_32/**
+!/src/*/libraries/libs_39_64/**
 # Exception: __pycache__/ we don't even want below libs
 /src/*/libs/**/__pycache__/
-/src/*/libs_39_32/**/__pycache__/
-/src/*/libs_39_64/**/__pycache__/
+/src/*/libraries/libs_39_32/**/__pycache__/
+/src/*/libraries/libs_39_64/**/__pycache__/

pyproject.toml

@@ -0,0 +1,70 @@
+[tool.ruff]
+line-length = 120
+src = ["./src/*/"]
+select = [
+    "F",
+    "E", "W",
+    "C90",
+    "I",
+    "N",
+    "D",
+    "UP",
+    "YTT",
+    "ANN",
+    "ASYNC",
+    "S",
+    "B",
+    "A",
+    "COM",
+    "C4",
+    "DTZ",
+    "T10",
+    "EM",
+    "FA",
+    "ISC",
+    "ICN",
+    "G",
+    "INP",
+    "PIE",
+    "T20",
+    "PT",
+    "Q",
+    "RSE",
+    "RET",
+    "SLF",
+    "SIM",
+    "TID",
+    "INT",
+    "ARG",
+    "PTH",
+    "TD",
+    "ERA",
+    "PD",
+    "PL",
+    "FLY",
+    "NPY",
+    "RUF",
+]
+ignore = [
+    "ANN101", "ANN102",
+    "D203", "D213", "D406", "D407",
+    "G004",  # logging does not have any built-in keyword string interpolation for the message itself, falling back to %s etc. is crap
+    "UP015",  # open mode should be clearly stated, explicit is better than implicit
+]
+
+[tool.ruff.pydocstyle]
+convention = "google"
+
+[tool.ruff.per-file-ignores]
+"tests/*" = ["S101", "SLF001", "INP001"]  # Tests should use assert, are allowed to test private internals, and aren't a package
+
+[tool.black]
+line-length = 120
+
+[tool.mypy]
+strict = true
+explicit_package_bases = true
+mypy_path = "./src/*/"
+exclude = [
+]
+follow_imports = "silent"

requirements.txt

@@ -1,62 +1,63 @@
-aiohttp==3.8.3
+aiohttp==3.8.4
 aioserial==1.3.1
-aiosignal==1.2.0
+aiosignal==1.3.1
 async-timeout==4.0.2
-attrs==22.1.0
-certifi==2022.9.24
+attrs==23.1.0
+certifi==2023.5.7
 cffi==1.15.1
-charset-normalizer==2.1.1
-clr-loader==0.2.4
-contourpy==1.0.6
+charset-normalizer==3.1.0
+clr-loader==0.2.5
+contourpy==1.0.7
 cycler==0.11.0
-dukpy==0.2.3
-filelock==3.8.0
-fonttools==4.38.0
-frozenlist==1.3.1
-greenlet==2.0.0.post0
+dukpy==0.3.0
+filelock==3.12.2
+fonttools==4.40.0
+frozenlist==1.3.3
+greenlet==2.0.2
 hanging-threads==2.0.5
 idna==3.4
 kiwisolver==1.4.4
 matplotlib==3.6.3
 minimalmodbus==2.0.1
-multidict==6.0.2
-numpy==1.23.4
-opencv-python==4.6.0.66
-packaging==21.3
-pandas==1.5.1
-Pillow==9.3.0
-psutil==5.9.3
+multidict==6.0.4
+numpy==1.24.3
+opencv-python==4.7.0.72
+packaging==23.1
+pandas==2.0.2
+Pillow==9.5.0
+psutil==5.9.5
 pycparser==2.21
 pycryptodomex==3.15.0
-PyPAC==0.16.0
-pyparsing==3.0.9
+PyPAC==0.16.4
+pyparsing==3.1.0
 pyserial==3.5
 PySide2==5.15.2.1
-pysmithplot-fork==0.2.0
-pysweepme
+pysmithplot-fork==0.2.1
+pysweepme==1.5.6.5
 python-certifi-win32==1.6.1
 python-dateutil==2.8.2
-python-dispatch==0.2.0
-pythonnet==3.0.0.post1
-pytz==2022.6
+python-dispatch==0.2.2
+pythonnet==3.0.1
+pytz==2023.3
 pyusb==1.2.1
-PyVISA==1.12.0
-pywin32==304
-requests==2.28.1
+PyVISA==1.13.0
+pywin32==306
 requests-file==1.5.1
-scikit-rf==0.24.0
+requests==2.31.0
+scikit-rf==0.27.1
 scipy==1.9.1
-setuptools-scm==7.0.5
+setuptools-scm==7.1.0
 shiboken2==5.15.2.1
 six==1.16.0
-SQLAlchemy==1.4.42
-tblib==1.7.0
-tinyaes==1.0.3
-tldextract==3.4.0
+SQLAlchemy==2.0.17
+tblib==2.0.0
+tinyaes==1.0.4
+tldextract==3.4.4
 tomli==2.0.1
-typing-extensions==4.4.0
-urllib3==1.26.12
-websockets==10.4
+typing-extensions==4.6.3
+tzdata==2023.3
+urllib3==2.0.3
+websockets==11.0.3
 WMI==1.5.1
-wrapt==1.14.1
-yarl==1.8.1
+wrapt==1.15.0
+yarl==1.9.2