diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index b2b89d50b..82d487cbd 100644 --- 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 index 7637cc296..5829c5d04 100644 --- 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 index 9020d9a76..f3d239939 100644 --- 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 index 7637cc296..5829c5d04 100644 --- 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 index 28c3dc457..11ee2fa6c 100644 --- 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 diff --git a/guideGlobalMetadata.json b/guideGlobalMetadata.json index 671e14938..ef5893021 100644 --- a/guideGlobalMetadata.json +++ b/guideGlobalMetadata.json @@ -31,6 +31,8 @@ "AxonaRecordingInterface", "VideoInterface", "NeuralynxRecordingInterface", + "Suite2pSegmentationInterface", + "AlphaOmegaRecordingInterface", "AlphaOmegaRecordingInterface", "DeepLabCutInterface", "SLEAPInterface", diff --git a/schemas/json/generated/Suite2pSegmentationInterface.json b/schemas/json/generated/Suite2pSegmentationInterface.json new file mode 100644 index 000000000..e5256c2f5 --- /dev/null +++ b/schemas/json/generated/Suite2pSegmentationInterface.json @@ -0,0 +1,37 @@ +{ + "required": [], + "properties": { + "Suite2pSegmentationInterface": { + "required": [ + "folder_path" + ], + "properties": { + "folder_path": { + "format": "directory", + "type": "string" + }, + "combined": { + "type": "boolean", + "default": false + }, + "plane_no": { + "type": "number", + "default": 0 + }, + "verbose": { + "type": "boolean", + "default": true + } + }, + "type": "object", + "additionalProperties": false + } + }, + "type": "object", + "additionalProperties": false, + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "source.schema.json", + "title": "Source data schema", + "description": "Schema for the source data, files and directories", + "version": "0.1.0" +} diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js index ee500075b..c0a1f0804 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js @@ -22,6 +22,8 @@ const propsToIgnore = [ "load_sync_channel", "stream_id", // NOTE: May be desired for other interfaces "nsx_override", + "combined", + "plane_no", ]; export class GuidedSourceDataPage extends ManagedPage {