Use artifact downloads instead of submodules (#2)

* Update submodules. Fix DM bugs in test_basic.py * Update acquire-driver-common and acquire-driver-hdcam. Restore recursive submodule checkout in CI. * Restore capital-T Tiff. * Try to enable long paths in CI. * Try again to enable long paths in CI. * Update typing and dcam tests * Update acquire-driver-common and acquire-video-runtime submodules * update acquire-driver-zarr submodule. * update deps, tests * testing (wip) * fix trigger assignment * update submodules * wip * update build and test yamls * fix packaging * packaging: remove old setuptools options * get dcam test to pass * fix packaging * build and test passes * remove driver submodules * update dcam and egrabber test yamls * add GH token to environment variables in typing test. * Clean up build script * Address PR comments. * update zarr sha * update shas --------- Co-authored-by: Nathan Clack <[email protected]>
melissawm · May 10, 2023 · 6909668 · 6909668
1 parent 51a7ea1
commit 6909668
Show file tree

Hide file tree

Showing 21 changed files with 265 additions and 674 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,10 +12,12 @@ jobs:
                 platform: [windows-latest, macos-latest, ubuntu-latest]
 
         runs-on: ${{matrix.platform}}
+        env:
+          GH_TOKEN: ${{ github.token }}
         steps:
             - uses: actions/checkout@v3
               with:
-                  submodules: true
+                  submodules: recursive
             - uses: messense/maturin-action@v1
               with:
                   command: build

diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml
@@ -21,6 +21,8 @@ jobs:
 
         permissions:
             actions: write
+        env:
+          GH_TOKEN: ${{ github.token }}
         steps:
             - name: Cancel Previous Runs
               uses: styfle/[email protected]
@@ -29,7 +31,7 @@ jobs:
 
             - uses: actions/checkout@v3
               with:
-                  submodules: true
+                  submodules: recursive
 
             - name: Set up Python ${{ matrix.python }}
               uses: actions/setup-python@v4
@@ -39,7 +41,7 @@ jobs:
             - name: Install
               run: |
                   pip install --upgrade pip
-                  pip install -e .[testing]
+                  pip install -e '.[testing]'
 
             - name: Test
               run: |

diff --git a/.github/workflows/test_pr_dcam.yml b/.github/workflows/test_pr_dcam.yml
@@ -19,6 +19,8 @@ jobs:
 
         permissions:
             actions: write
+        env:
+          GH_TOKEN: ${{ github.token }}
         steps:
             - name: Cancel Previous Runs
               uses: styfle/[email protected]
@@ -27,7 +29,7 @@ jobs:
 
             - uses: actions/checkout@v3
               with:
-                  submodules: true
+                  submodules: recursive
 
             - name: Get CMake 3.24
               uses: lukka/get-cmake@latest

diff --git a/.github/workflows/test_pr_egrabber.yml b/.github/workflows/test_pr_egrabber.yml
@@ -19,6 +19,8 @@ jobs:
 
         permissions:
             actions: write
+        env:
+          GH_TOKEN: ${{ github.token }}
         steps:
             - name: Cancel Previous Runs
               uses: styfle/[email protected]
@@ -27,7 +29,7 @@ jobs:
 
             - uses: actions/checkout@v3
               with:
-                  submodules: true
+                  submodules: recursive
 
             - name: Get CMake 3.24
               uses: lukka/get-cmake@latest

diff --git a/.github/workflows/test_typing.yml b/.github/workflows/test_typing.yml
@@ -8,10 +8,12 @@ on:
 jobs:
   typing:
     runs-on: windows-latest
+    env:
+      GH_TOKEN: ${{ github.token }}
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: true
+          submodules: recursive
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4

diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ Testing
 *.zarr
 *.tif
 *.json
+Cargo.lock
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -82,3 +83,6 @@ docs/_build/
 
 # mypy stubgen
 out/
+
+# dotenv
+.env
diff --git a/.gitmodules b/.gitmodules
@@ -2,15 +2,3 @@
 	path = acquire-video-runtime
 	url = ../acquire-video-runtime.git
 	branch = main
-[submodule "acquire-driver-zarr"]
-	path = acquire-driver-zarr
-	url = ../acquire-driver-zarr.git
-[submodule "acquire-driver-hdcam"]
-	path = acquire-driver-hdcam
-	url = ../acquire-driver-hdcam
-[submodule "acquire-driver-egrabber"]
-	path = acquire-driver-egrabber
-	url = ../acquire-driver-egrabber
-[submodule "acquire-driver-common"]
-	path = acquire-driver-common
-	url = ../acquire-driver-common