Merge branch 'main' into Suite2pSegmentationInterface

NeurodataWithoutBorders · Jan 9, 2024 · fef12f6 · fef12f6
2 parents a6587ea + d932295
commit fef12f6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml
@@ -24,12 +24,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
         include:
-          - python-version: "3.9"
-            os: ubuntu-latest
-            label: environments/environment-Linux.yml
-            prefix: /usr/share/miniconda3/envs/nwb-guide
+          # current linux installation instructions use dev mode instead of distributable
+          # - python-version: "3.9"
+          #   os: ubuntu-latest
+          #   label: environments/environment-Linux.yml
+          #   prefix: /usr/share/miniconda3/envs/nwb-guide
 
           - python-version: "3.9"
             os: macos-latest

diff --git a/environments/environment-Linux.yml b/environments/environment-Linux.yml
@@ -4,7 +4,7 @@ channels:
   - defaults
 dependencies:
   - python = 3.9.18
-  - PyInstaller = 5.13.0
+  - PyInstaller = 6.3.0
   - nodejs = 18.16.1
   - numcodecs = 0.11.0
   # install these from conda-forge so that dependent packages get included in the distributable

diff --git a/environments/environment-MAC-arm64.yml b/environments/environment-MAC-arm64.yml
@@ -4,7 +4,7 @@ channels:
   - defaults
 dependencies:
   - python = 3.9.18
-  - PyInstaller = 5.13.0
+  - PyInstaller = 6.3.0
   - nodejs = 18.16.1
   - numcodecs = 0.11.0
   - lxml = 4.9.3  # pypi build fails due to x64/arm64 mismatch so install from conda-forge

diff --git a/environments/environment-MAC.yml b/environments/environment-MAC.yml
@@ -4,7 +4,7 @@ channels:
   - defaults
 dependencies:
   - python = 3.9.18
-  - PyInstaller = 5.13.0
+  - PyInstaller = 6.3.0
   - nodejs = 18.16.1
   - numcodecs = 0.11.0
   # install these from conda-forge so that dependent packages get included in the distributable

diff --git a/environments/environment-Windows.yml b/environments/environment-Windows.yml
@@ -5,7 +5,7 @@ channels:
 dependencies:
   - python = 3.9.17
   - nodejs = 18.16.1
-  - PyInstaller = 5.13.0
+  - PyInstaller = 6.3.0
   - pywin32 = 303
   - git = 2.20.1
   - setuptools = 58.0.4