From 9b84832a524e99a6b38b2a7a18eb110046f5f0be Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:30:08 -0400 Subject: [PATCH 1/7] try neuroconv specific debug --- environments/environment-MAC-arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/environment-MAC-arm64.yml b/environments/environment-MAC-arm64.yml index bb11633f9..93bd9ef53 100644 --- a/environments/environment-MAC-arm64.yml +++ b/environments/environment-MAC-arm64.yml @@ -20,6 +20,6 @@ dependencies: - flask == 2.3.2 - flask-cors == 4.0.0 - flask_restx == 1.1.0 - - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[ecephys] + - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@improve_sonpy_installation_m1#neuroconv[full] - pytest == 7.4.0 - pytest-cov == 4.1.0 From c3658e7bf71d7a2ca6545a11161c39f9cd23bedd Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Tue, 12 Sep 2023 13:45:44 -0400 Subject: [PATCH 2/7] Update pyflask-build-and-dist-tests.yml --- .github/workflows/pyflask-build-and-dist-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index 5fbea858d..a58c77944 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -85,7 +85,9 @@ jobs: # fix for macos build - if: matrix.os == 'macos-latest' - run: rm -f /Users/runner/miniconda3/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so + run: | + rm -f /Users/runner/miniconda3/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so + rm -f /usr/local/miniconda/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so - name: Build PyFlask distribution run: npm run build:flask:${{ matrix.shorthand }} From e3d9eff1acc6f20a561d4d6c6e74ef3401e614c3 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Tue, 12 Sep 2023 13:46:59 -0400 Subject: [PATCH 3/7] Update Build-and-deploy-mac.yml --- .github/workflows/Build-and-deploy-mac.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml index e4ee051bf..3411f2fed 100644 --- a/.github/workflows/Build-and-deploy-mac.yml +++ b/.github/workflows/Build-and-deploy-mac.yml @@ -33,6 +33,9 @@ jobs: - name: Install package.json modules and their dependencies run: npm install --ignore-scripts + - if: matrix.os == 'macos-latest' + run: rm -f /usr/local/miniconda/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so + - uses: apple-actions/import-codesign-certs@v1 with: # https://developer.apple.com/account/resources/certificates/add @@ -56,5 +59,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} appleId: ${{ secrets.APPLE_ID }} # currently this is set to Ryan's Apple ID and password appleIdPassword: ${{ secrets.APPLE_PASSWORD }} - run: | - npm run deploy:mac + run: npm run deploy:mac From 97b1caa6eee66f4e1d398ea7d97e59e9c6897bc0 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Tue, 12 Sep 2023 13:47:13 -0400 Subject: [PATCH 4/7] Update pyflask-build-and-dist-tests.yml --- .github/workflows/pyflask-build-and-dist-tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index a58c77944..5fbea858d 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -85,9 +85,7 @@ jobs: # fix for macos build - if: matrix.os == 'macos-latest' - run: | - rm -f /Users/runner/miniconda3/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so - rm -f /usr/local/miniconda/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so + run: rm -f /Users/runner/miniconda3/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so - name: Build PyFlask distribution run: npm run build:flask:${{ matrix.shorthand }} From 97b8d8f86cc26e140272f564479372960c070aca Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:08:21 -0400 Subject: [PATCH 5/7] Update Build-and-deploy-mac.yml --- .github/workflows/Build-and-deploy-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml index 3411f2fed..dd7a77988 100644 --- a/.github/workflows/Build-and-deploy-mac.yml +++ b/.github/workflows/Build-and-deploy-mac.yml @@ -33,7 +33,7 @@ jobs: - name: Install package.json modules and their dependencies run: npm install --ignore-scripts - - if: matrix.os == 'macos-latest' + - name: Remove bad sonpy file (might make Spike2 format unusable on Mac - should exclude from selection) run: rm -f /usr/local/miniconda/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so - uses: apple-actions/import-codesign-certs@v1 From 942edbdbbf4ab441faebf59372cccfdf7abecf13 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:09:15 -0400 Subject: [PATCH 6/7] update to main post merge --- environments/environment-MAC-arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/environment-MAC-arm64.yml b/environments/environment-MAC-arm64.yml index 93bd9ef53..6e4508a61 100644 --- a/environments/environment-MAC-arm64.yml +++ b/environments/environment-MAC-arm64.yml @@ -20,6 +20,6 @@ dependencies: - flask == 2.3.2 - flask-cors == 4.0.0 - flask_restx == 1.1.0 - - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@improve_sonpy_installation_m1#neuroconv[full] + - neuroconv @ git+https://github.com/catalystneuro/neuroconv.git@main#neuroconv[full] - pytest == 7.4.0 - pytest-cov == 4.1.0 From ddcbc4b255789e7a454ee432bd3fa73243c69809 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:09:56 -0400 Subject: [PATCH 7/7] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bfa42d93..3ea6741de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nwb-guide", "productName": "NWB GUIDE", - "version": "0.0.4", + "version": "0.0.5", "description": "", "main": "./build/main/main.js", "scripts": {