Skip to content

Commit

Permalink
Merge branch 'main' into fix_neurosift_plus
Browse files Browse the repository at this point in the history
  • Loading branch information
rly authored Feb 24, 2025
2 parents 80b355b + 318c8df commit 3ba9a4f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
3 changes: 1 addition & 2 deletions environments/environment-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ channels:
- conda-forge
- defaults
dependencies:
- python = 3.9.18
- python = 3.12.9
- nodejs = 18.16.1
- numcodecs = 0.11.0
# install these from conda-forge so that dependent packages get included in the distributable
- jsonschema = 4.18.0 # installs jsonschema-specifications
- pip
Expand Down
7 changes: 3 additions & 4 deletions environments/environment-MAC-apple-silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ channels:
- conda-forge
- defaults
dependencies:
- python = 3.9.18
- python = 3.12.9
- nodejs = 18.16.1
# Install these from conda-forge so that dependent packages get included in the distributable
- numcodecs = 0.11.0
- lxml = 4.9.3 # PyPI build fails due to x64/arm64 mismatch so install from conda-forge
- pyedflib = 0.1.32 # PyPI build fails due to x64/arm64 mismatch so install from conda-forge
- pyedflib = 0.1.38 # PyPI build fails due to x64/arm64 mismatch so install from conda-forge
- numpy # May have x64/arm64 mismatch issues so install from conda-forge
- pytables = 3.8 # PyPI build fails on arm64 so install from conda-forge (used by neuroconv deps)
- pytables = 3.10.2 # PyPI build fails on arm64 so install from conda-forge (used by neuroconv deps)
- jsonschema = 4.18.0 # Also installs jsonschema-specifications
- pip
- pip:
Expand Down
5 changes: 2 additions & 3 deletions environments/environment-MAC-intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ channels:
- conda-forge
- defaults
dependencies:
- python = 3.9.18
- python = 3.12.9
- nodejs = 18.16.1
- numcodecs = 0.11.0
# install these from conda-forge so that dependent packages get included in the distributable
- jsonschema = 4.18.0 # installs jsonschema-specifications
- pytables = 3.10.2 # Install from conda-forge because PyPI version results in hdf5 conflicts and missing libs
- pip
- pip:
- setuptools==70.0.0
Expand All @@ -28,4 +28,3 @@ dependencies:
- tzlocal >= 5.2 # Frontend timezone handling
- ndx-pose == 0.1.1
- nwbinspector==0.6.2
- tables
5 changes: 2 additions & 3 deletions environments/environment-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ channels:
- defaults
- conda-forge
dependencies:
- python = 3.9.17
- python = 3.12.9
- nodejs = 18.16.1
- pywin32 = 303
- pywin32 = 308
- git = 2.20.1
- setuptools = 58.0.4
- pip
- pip:
- setuptools==70.0.0
Expand Down
2 changes: 2 additions & 0 deletions nwb-guide.spec
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ hiddenimports = [
'email_validator',
*collect_submodules('scipy.special.cython_special'),
*collect_submodules('scipy.special._cdflib'),
'scipy._lib.array_api_compat.numpy.fft',
]

datas += collect_data_files('jsonschema_specifications')
Expand All @@ -40,6 +41,7 @@ modules_to_collect = [
'tzdata',
'elephant',
'ScanImageTiffReader',
'deprecated',
]
for module_name in modules_to_collect:
collection = collect_all(module_name)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nwb-guide",
"productName": "NWB GUIDE",
"version": "1.0.5",
"version": "1.0.6-beta",
"description": "NWB GUIDE is a desktop app that provides a no-code user interface for converting neurophysiology data to NWB.",
"main": "./build/main/index.js",
"engine": {
Expand Down

0 comments on commit 3ba9a4f

Please sign in to comment.