Skip to content

Commit

Permalink
Merge branch 'main' into fix-nested-form-cell-error-display
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyCBakerPhD authored Mar 13, 2024
2 parents 71575f6 + 4dd13fc commit 55622b9
Show file tree
Hide file tree
Showing 43 changed files with 1,061 additions and 473 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ src/build
.env
.env.local
.env.production

# Spyder
.spyproject/
20 changes: 20 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,26 @@
}
add_module_names = False

html_theme_options = {
"use_edit_page_button": True,
"icon_links": [
{
"name": "GitHub",
"url": "https://github.com/NeurodataWithoutBorders/nwb-guide",
"icon": "fa-brands fa-github",
"type": "fontawesome",
},
],
}

html_context = {
# "github_url": "https://github.com", # or your GitHub Enterprise site
"github_user": "NeurodataWithoutBorders",
"github_repo": "nwb-guide",
"github_version": "main",
"doc_path": "docs",
}


def _correct_signatures(app, what, name, obj, options, signature, return_annotation):
if what == "class":
Expand Down
2 changes: 1 addition & 1 deletion environments/environment-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- flask == 2.3.2
- flask-cors == 4.0.0
- flask_restx == 1.1.0
- neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@try_remove_packaing_bound#neuroconv[full]
- neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[full]
- dandi >= 0.60.0
- pytest == 7.4.0
- pytest-cov == 4.1.0
Expand Down
1 change: 1 addition & 0 deletions environments/environment-MAC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies:
- jsonschema = 4.18.0 # installs jsonschema-specifications
- pip
- pip:
- scipy<1.12.0 # Fix needed for scipy._lib._testutils
- chardet == 5.1.0
- configparser == 6.0.0
- flask == 2.3.2
Expand Down
2 changes: 1 addition & 1 deletion environments/environment-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- flask == 2.3.2
- flask-cors === 3.0.10
- flask_restx == 1.1.0
- neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@try_remove_packaing_bound#neuroconv[full]
- neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[full]
- dandi >= 0.60.0
- pytest == 7.2.2
- pytest-cov == 4.1.0
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
"build:mac": "npm run build && npm run build:flask && npm run build:electron:mac",
"build:linux": "npm run build && npm run build:flask && npm run build:electron:linux",
"build:flask": "python -m PyInstaller nwb-guide.spec --log-level DEBUG --clean --noconfirm --distpath ./build/flask",
"build:flask:spec:base": "pyi-makespec --name nwb-guide --onedir --collect-data jsonschema_specifications --collect-all dandi --collect-all keyrings --collect-all unittest --collect-all nwbinspector --collect-all neuroconv --collect-all pynwb --collect-all hdmf --collect-all hdmf_zarr --collect-all ndx_dandi_icephys --collect-all sklearn --collect-all ci_info ./pyflask/app.py",
"build:flask:spec": "npm run build:flask:spec:base && python prepare_pyinstaller_spec.py",
"build:electron:win": "electron-builder build --win --publish never",
"build:electron:mac": "electron-builder build --mac --publish never",
"build:electron:linux": "electron-builder build --linux --publish never",
Expand Down
43 changes: 0 additions & 43 deletions prepare_pyinstaller_spec.py

This file was deleted.

Loading

0 comments on commit 55622b9

Please sign in to comment.