Skip to content

Commit 318c8df

Browse files
authored
Merge pull request #972 from NeurodataWithoutBorders/py310
2 parents 041e5bd + 9eb6474 commit 318c8df

File tree

8 files changed

+23
-21
lines changed

8 files changed

+23
-21
lines changed

environments/environment-Linux.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- python = 3.9.18
6+
- python = 3.12.9
77
- nodejs = 18.16.1
8-
- numcodecs = 0.11.0
98
# install these from conda-forge so that dependent packages get included in the distributable
109
- jsonschema = 4.18.0 # installs jsonschema-specifications
1110
- pip

environments/environment-MAC-apple-silicon.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- python = 3.9.18
6+
- python = 3.12.9
77
- nodejs = 18.16.1
88
# Install these from conda-forge so that dependent packages get included in the distributable
9-
- numcodecs = 0.11.0
109
- lxml = 4.9.3 # PyPI build fails due to x64/arm64 mismatch so install from conda-forge
11-
- pyedflib = 0.1.32 # PyPI build fails due to x64/arm64 mismatch so install from conda-forge
10+
- pyedflib = 0.1.38 # PyPI build fails due to x64/arm64 mismatch so install from conda-forge
1211
- numpy # May have x64/arm64 mismatch issues so install from conda-forge
13-
- pytables = 3.8 # PyPI build fails on arm64 so install from conda-forge (used by neuroconv deps)
12+
- pytables = 3.10.2 # PyPI build fails on arm64 so install from conda-forge (used by neuroconv deps)
1413
- jsonschema = 4.18.0 # Also installs jsonschema-specifications
1514
- pip
1615
- pip:

environments/environment-MAC-intel.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- python = 3.9.18
6+
- python = 3.12.9
77
- nodejs = 18.16.1
8-
- numcodecs = 0.11.0
98
# install these from conda-forge so that dependent packages get included in the distributable
109
- jsonschema = 4.18.0 # installs jsonschema-specifications
10+
- pytables = 3.10.2 # Install from conda-forge because PyPI version results in hdf5 conflicts and missing libs
1111
- pip
1212
- pip:
1313
- setuptools==70.0.0
@@ -28,4 +28,3 @@ dependencies:
2828
- tzlocal >= 5.2 # Frontend timezone handling
2929
- ndx-pose == 0.1.1
3030
- nwbinspector==0.6.2
31-
- tables

environments/environment-Windows.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ channels:
33
- defaults
44
- conda-forge
55
dependencies:
6-
- python = 3.9.17
6+
- python = 3.12.9
77
- nodejs = 18.16.1
8-
- pywin32 = 303
8+
- pywin32 = 308
99
- git = 2.20.1
10-
- setuptools = 58.0.4
1110
- pip
1211
- pip:
1312
- setuptools==70.0.0

nwb-guide.spec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ hiddenimports = [
1616
'email_validator',
1717
*collect_submodules('scipy.special.cython_special'),
1818
*collect_submodules('scipy.special._cdflib'),
19+
'scipy._lib.array_api_compat.numpy.fft',
1920
]
2021

2122
datas += collect_data_files('jsonschema_specifications')
@@ -40,6 +41,7 @@ modules_to_collect = [
4041
'tzdata',
4142
'elephant',
4243
'ScanImageTiffReader',
44+
'deprecated',
4345
]
4446
for module_name in modules_to_collect:
4547
collection = collect_all(module_name)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nwb-guide",
33
"productName": "NWB GUIDE",
4-
"version": "1.0.5",
4+
"version": "1.0.6-beta",
55
"description": "NWB GUIDE is a desktop app that provides a no-code user interface for converting neurophysiology data to NWB.",
66
"main": "./build/main/index.js",
77
"engine": {

src/electron/frontend/assets/css/main.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,9 @@ button[disabled] {
310310
padding: 3px 10px;
311311
background-color: #fff;
312312
font-size: 13px;
313-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans",
314-
sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
313+
font-family:
314+
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif,
315+
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
315316
}
316317

317318
.menu.file {
@@ -324,8 +325,9 @@ button[disabled] {
324325
background-color: #fff;
325326
color: black;
326327
font-size: 13px;
327-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans",
328-
sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
328+
font-family:
329+
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif,
330+
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
329331
}
330332

331333
.menu.file li:hover {
@@ -355,8 +357,9 @@ button[disabled] {
355357
padding: 3px 10px;
356358
background-color: #fff;
357359
font-size: 13px;
358-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans",
359-
sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
360+
font-family:
361+
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif,
362+
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
360363
}
361364

362365
.menu.reg-folder.off {

src/electron/frontend/core/components/BasicTable.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@ export class BasicTable extends LitElement {
108108
margin: 0px 5px;
109109
text-align: center;
110110
font-size: 80%;
111-
font-family: "Twemoji Mozilla", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",
112-
"Noto Color Emoji", "EmojiOne Color", "Android Emoji", sans-serif;
111+
font-family:
112+
"Twemoji Mozilla", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji",
113+
"EmojiOne Color", "Android Emoji", sans-serif;
113114
}
114115
115116
#buttons {

0 commit comments

Comments
 (0)