v2022.7.0 (#10)

* release prep * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * release prep fix v2022.7.0 * release prep del gitlab-ci file, fixed changelog links, updated yaq-traits reference version * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * release prep fixed changelog links Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
yaq-project · Jul 18, 2022 · 9ed470a · 9ed470a
1 parent c5b2641
commit 9ed470a
Show file tree

Hide file tree

Showing 30 changed files with 179 additions and 99 deletions.
diff --git a/.gitlab/CODEOWNERS → .github/CODEOWNERS b/.gitlab/CODEOWNERS → .github/CODEOWNERS
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -0,0 +1,29 @@
+# This workflows will upload a Python Package using flit when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip!=22.1.*
+        pip install flit
+    - name: Build and publish
+      env:
+        FLIT_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        FLIT_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: flit publish
diff --git a/.github/workflows/run-entry-points.yml b/.github/workflows/run-entry-points.yml
@@ -0,0 +1,49 @@
+name: run entry points
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip!=22.1.*
+        python -m pip install --upgrade wheel setuptools
+        python -m pip install --upgrade .
+    - name: Test with pytest
+      run: |
+        yaqd-thorlabs-bsc201 --version
+        yaqd-thorlabs-bsc201 -h
+        yaqd-thorlabs-bsc203 --version
+        yaqd-thorlabs-bsc203 -h
+        yaqd-thorlabs-k10cr1 --version
+        yaqd-thorlabs-k10cr1 -h
+        yaqd-thorlabs-kdc101 --version
+        yaqd-thorlabs-kdc101 -h
+        yaqd-thorlabs-kst101 --version
+        yaqd-thorlabs-kst101 -h
+        yaqd-thorlabs-lts150 --version
+        yaqd-thorlabs-lts150 -h
+        yaqd-thorlabs-lts300 --version
+        yaqd-thorlabs-lts300 -h
+        yaqd-thorlabs-mpc320 --version
+        yaqd-thorlabs-mpc320 -h
+        yaqd-thorlabs-ell18 --version
+        yaqd-thorlabs-ell18 -h
+        yaqd-thorlabs-pax1000 --version
+        yaqd-thorlabs-pax1000 -h
+        yaqd-thorlabs-pm-triggered --version
+        yaqd-thorlabs-pm-triggered -h
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,8 +21,8 @@ repos:
       - id: mypy
         exclude: ^docs/conf.py
 
-  - repo: https://gitlab.com/yaq/yaq-traits
-    rev: v2022.3.0
+  - repo: https://github.com/yaq-project/yaq-traits
+    rev: v2022.7.0
     hooks:
       - id: yaq-traits-check
       - id: yaq-traits-compose

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [2022.7.0]
+
 ### Changed
 - Log levels of serial communication logging
 
@@ -104,16 +106,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### Added
 - initial release
 
-[Unreleased]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2022.4.0...main
-[2022.4.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2022.3.0...v2022.4.0
-[2022.3.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2022.2.1...v2022.3.0
-[2022.2.1]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2022.2.0...v2022.2.1
-[2022.2.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2022.1.0...v2022.2.0
-[2022.1.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2021.10.0...v2022.1.0
-[2021.10.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2021.3.0...v2021.10.0
-[2021.3.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2021.2.0...v2021.3.0
-[2021.2.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2020.12.0...v2021.2.0
-[2020.12.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2020.11.1...v2020.12.0
-[2020.11.1]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2020.11.0...v2020.11.1
-[2020.11.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2020.07.0...v2020.11.0
-[2020.07.0]: https://gitlab.com/yaq/yaqd-thorlabs/-/compare/v2020.06.0...v2020.07.0
+[Unreleased]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2022.4.0...main
+[2022.4.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2022.3.0...v2022.4.0
+[2022.3.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2022.2.1...v2022.3.0
+[2022.2.1]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2022.2.0...v2022.2.1
+[2022.2.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2022.1.0...v2022.2.0
+[2022.1.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2021.10.0...v2022.1.0
+[2021.10.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2021.3.0...v2021.10.0
+[2021.3.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2021.2.0...v2021.3.0
+[2021.2.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2020.12.0...v2021.2.0
+[2020.12.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2020.11.1...v2020.12.0
+[2020.11.1]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2020.11.0...v2020.11.1
+[2020.11.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2020.07.0...v2020.11.0
+[2020.07.0]: https://github.com/yaq-project/yaqd-thorlabs/compare/v2020.06.0...v2020.07.0
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![yaq](https://img.shields.io/badge/framework-yaq-orange)](https://yaq.fyi/)
 [![black](https://img.shields.io/badge/code--style-black-black)](https://black.readthedocs.io/)
 [![ver](https://img.shields.io/badge/calver-YYYY.0M.MICRO-blue)](https://calver.org/)
-[![log](https://img.shields.io/badge/change-log-informational)](https://gitlab.com/yaq/yaqd-thorlabs/-/blob/main/CHANGELOG.md)
+[![log](https://img.shields.io/badge/change-log-informational)](https://github.com/yaq-project/yaqd-thorlabs/-/blob/main/CHANGELOG.md)
 
 yaq daemons for thorlabs hardware
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -28,8 +28,8 @@ classifiers = [
 ]
 
 [tool.flit.metadata.urls]
-Source = "https://gitlab.com/yaq/yaqd-thorlabs"
-Issues = "https://gitlab.com/yaq/yaqd-thorlabs/issues"
+Source = "https://github.com/yaq-project/yaqd-thorlabs"
+Issues = "https://github.com/yaq-project/yaqd-thorlabs/issues"
 
 [tool.flit.metadata.requires-extra]
 dev = ["black", "pre-commit"]

diff --git a/yaqd_thorlabs/VERSION b/yaqd_thorlabs/VERSION
@@ -1 +1 @@
-2022.4.0
+2022.7.0
diff --git a/yaqd_thorlabs/thorlabs-bsc201.avpr b/yaqd_thorlabs/thorlabs-bsc201.avpr
@@ -129,9 +129,9 @@
         "conda-forge": "https://anaconda.org/conda-forge/yaqd-thorlabs"
     },
     "links": {
-        "bugtracker": "https://gitlab.com/yaq/yaqd-thorlabs/issues",
+        "bugtracker": "https://github.com/yaq-project/yaqd-thorlabs/issues",
         "manufacturer": "https://www.thorlabschina.cn/thorProduct.cfm?partNumber=BSC201",
-        "source": "https://gitlab.com/yaq/yaqd-thorlabs/"
+        "source": "https://github.com/yaq-project/yaqd-thorlabs/"
     },
     "messages": {
         "busy": {
@@ -265,13 +265,13 @@
     },
     "properties": {
         "destination": {
-            "control_kind": "normal",
+            "control_kind": "hinted",
             "dynamic": true,
             "getter": "get_destination",
-            "limits_getter": null,
+            "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": null,
+            "setter": "set_position",
             "type": "double",
             "units_getter": "get_units"
         },
@@ -282,7 +282,7 @@
             "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": "set_position",
+            "setter": null,
             "type": "double",
             "units_getter": "get_units"
         }

diff --git a/yaqd_thorlabs/thorlabs-bsc201.toml b/yaqd_thorlabs/thorlabs-bsc201.toml
@@ -6,8 +6,8 @@ traits = ["has-limits", "is-homeable", "uses-uart", "is-daemon"]
 hardware = ["thorlabs:bsc201"]
 
 [links]
-source = "https://gitlab.com/yaq/yaqd-thorlabs/"
-bugtracker = "https://gitlab.com/yaq/yaqd-thorlabs/issues"
+source = "https://github.com/yaq-project/yaqd-thorlabs/"
+bugtracker = "https://github.com/yaq-project/yaqd-thorlabs/issues"
 manufacturer = "https://www.thorlabschina.cn/thorProduct.cfm?partNumber=BSC201"
 
 [config]

diff --git a/yaqd_thorlabs/thorlabs-bsc203.avpr b/yaqd_thorlabs/thorlabs-bsc203.avpr
@@ -130,9 +130,9 @@
         "conda-forge": "https://anaconda.org/conda-forge/yaqd-thorlabs"
     },
     "links": {
-        "bugtracker": "https://gitlab.com/yaq/yaqd-thorlabs/issues",
+        "bugtracker": "https://github.com/yaq-project/yaqd-thorlabs/issues",
         "manufacturer": "https://www.thorlabschina.cn/thorProduct.cfm?partNumber=BSC203",
-        "source": "https://gitlab.com/yaq/yaqd-thorlabs/"
+        "source": "https://github.com/yaq-project/yaqd-thorlabs/"
     },
     "messages": {
         "busy": {
@@ -266,13 +266,13 @@
     },
     "properties": {
         "destination": {
-            "control_kind": "normal",
+            "control_kind": "hinted",
             "dynamic": true,
             "getter": "get_destination",
-            "limits_getter": null,
+            "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": null,
+            "setter": "set_position",
             "type": "double",
             "units_getter": "get_units"
         },
@@ -283,7 +283,7 @@
             "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": "set_position",
+            "setter": null,
             "type": "double",
             "units_getter": "get_units"
         }

diff --git a/yaqd_thorlabs/thorlabs-bsc203.toml b/yaqd_thorlabs/thorlabs-bsc203.toml
@@ -6,8 +6,8 @@ traits = ["has-limits", "is-homeable", "uses-uart", "is-daemon"]
 hardware = ["thorlabs:bsc203", "thorlabs:lnr502"]
 
 [links]
-source = "https://gitlab.com/yaq/yaqd-thorlabs/"
-bugtracker = "https://gitlab.com/yaq/yaqd-thorlabs/issues"
+source = "https://github.com/yaq-project/yaqd-thorlabs/"
+bugtracker = "https://github.com/yaq-project/yaqd-thorlabs/issues"
 manufacturer = "https://www.thorlabschina.cn/thorProduct.cfm?partNumber=BSC203"
 
 [config]

diff --git a/yaqd_thorlabs/thorlabs-ell18.avpr b/yaqd_thorlabs/thorlabs-ell18.avpr
@@ -116,9 +116,9 @@
         "PyPI": "https://pypi.org/project/yaqd-thorlabs"
     },
     "links": {
-        "bugtracker": "https://gitlab.com/yaqyaqd-thorlabs/-/issues",
+        "bugtracker": "https://github.com/yaq-project/yaqd-thorlabs/-/issues",
         "manufacturer": "https://www.thorlabs.us/thorproduct.cfm?partnumber=ELL18",
-        "source": "https://gitlab.com/yaq/yaqd-thorlabs"
+        "source": "https://github.com/yaq-project/yaqd-thorlabs"
     },
     "messages": {
         "busy": {
@@ -252,13 +252,13 @@
     },
     "properties": {
         "destination": {
-            "control_kind": "normal",
+            "control_kind": "hinted",
             "dynamic": true,
             "getter": "get_destination",
-            "limits_getter": null,
+            "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": null,
+            "setter": "set_position",
             "type": "double",
             "units_getter": "get_units"
         },
@@ -269,7 +269,7 @@
             "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": "set_position",
+            "setter": null,
             "type": "double",
             "units_getter": "get_units"
         }

diff --git a/yaqd_thorlabs/thorlabs-ell18.toml b/yaqd_thorlabs/thorlabs-ell18.toml
@@ -4,8 +4,8 @@ traits = ["has-limits", "is-homeable", "uses-uart", "is-daemon"]
 hardware = ["thorlabs:ell18", "thorlabs:ell18m"]
 
 [links]
-source = "https://gitlab.com/yaq/yaqd-thorlabs"
-bugtracker = "https://gitlab.com/yaqyaqd-thorlabs/-/issues"
+source = "https://github.com/yaq-project/yaqd-thorlabs"
+bugtracker = "https://github.com/yaq-project/yaqd-thorlabs/-/issues"
 manufacturer = "https://www.thorlabs.us/thorproduct.cfm?partnumber=ELL18"
 
 [installation]

diff --git a/yaqd_thorlabs/thorlabs-k10cr1.avpr b/yaqd_thorlabs/thorlabs-k10cr1.avpr
@@ -130,9 +130,9 @@
         "conda-forge": "https://anaconda.org/conda-forge/yaqd-thorlabs"
     },
     "links": {
-        "bugtracker": "https://gitlab.com/yaq/yaqd-thorlabs/issues",
+        "bugtracker": "https://github.com/yaq-project/yaqd-thorlabs/issues",
         "manufacturer": "https://www.thorlabs.com/newgrouppage9.cfm?objectgroup_id=8750&pn=K10CR1",
-        "source": "https://gitlab.com/yaq/yaqd-thorlabs/"
+        "source": "https://github.com/yaq-project/yaqd-thorlabs/"
     },
     "messages": {
         "busy": {
@@ -266,13 +266,13 @@
     },
     "properties": {
         "destination": {
-            "control_kind": "normal",
+            "control_kind": "hinted",
             "dynamic": true,
             "getter": "get_destination",
-            "limits_getter": null,
+            "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": null,
+            "setter": "set_position",
             "type": "double",
             "units_getter": "get_units"
         },
@@ -283,7 +283,7 @@
             "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": "set_position",
+            "setter": null,
             "type": "double",
             "units_getter": "get_units"
         }

diff --git a/yaqd_thorlabs/thorlabs-k10cr1.toml b/yaqd_thorlabs/thorlabs-k10cr1.toml
@@ -6,8 +6,8 @@ traits = ["has-limits", "is-homeable", "uses-uart", "is-daemon"]
 hardware = ["thorlabs:k10cr1"]
 
 [links]
-source = "https://gitlab.com/yaq/yaqd-thorlabs/"
-bugtracker = "https://gitlab.com/yaq/yaqd-thorlabs/issues"
+source = "https://github.com/yaq-project/yaqd-thorlabs/"
+bugtracker = "https://github.com/yaq-project/yaqd-thorlabs/issues"
 manufacturer = "https://www.thorlabs.com/newgrouppage9.cfm?objectgroup_id=8750&pn=K10CR1"
 
 [config]

diff --git a/yaqd_thorlabs/thorlabs-kdc101.avpr b/yaqd_thorlabs/thorlabs-kdc101.avpr
@@ -129,9 +129,9 @@
         "conda-forge": "https://anaconda.org/conda-forge/yaqd-thorlabs"
     },
     "links": {
-        "bugtracker": "https://gitlab.com/yaq/yaqd-thorlabs/issues",
+        "bugtracker": "https://github.com/yaq-project/yaqd-thorlabs/issues",
         "manufacturer": "https://www.thorlabs.com/newgrouppage9.cfm?objectgroup_id=2419&pn=KDC101",
-        "source": "https://gitlab.com/yaq/yaqd-thorlabs/"
+        "source": "https://github.com/yaq-project/yaqd-thorlabs/"
     },
     "messages": {
         "busy": {
@@ -265,13 +265,13 @@
     },
     "properties": {
         "destination": {
-            "control_kind": "normal",
+            "control_kind": "hinted",
             "dynamic": true,
             "getter": "get_destination",
-            "limits_getter": null,
+            "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": null,
+            "setter": "set_position",
             "type": "double",
             "units_getter": "get_units"
         },
@@ -282,7 +282,7 @@
             "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": "set_position",
+            "setter": null,
             "type": "double",
             "units_getter": "get_units"
         }

diff --git a/yaqd_thorlabs/thorlabs-kdc101.toml b/yaqd_thorlabs/thorlabs-kdc101.toml
@@ -6,8 +6,8 @@ traits = ["has-limits", "is-homeable", "uses-uart", "is-daemon"]
 hardware = ["thorlabs:kdc101"]
 
 [links]
-source = "https://gitlab.com/yaq/yaqd-thorlabs/"
-bugtracker = "https://gitlab.com/yaq/yaqd-thorlabs/issues"
+source = "https://github.com/yaq-project/yaqd-thorlabs/"
+bugtracker = "https://github.com/yaq-project/yaqd-thorlabs/issues"
 manufacturer = "https://www.thorlabs.com/newgrouppage9.cfm?objectgroup_id=2419&pn=KDC101"
 
 [config]