Merge pull request #135 from portugueslab/env_bug

Fix #134 Installation bug
portugueslab · Mar 31, 2022 · c96890c · c96890c
2 parents ad2a191 + cbbb4d6
commit c96890c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/doc_deploy.yml b/.github/workflows/doc_deploy.yml
@@ -1,11 +1,25 @@
-name: page_deploy
+name: 🚀 page_deploy
 
-on: push
-  # Trigger the workflow on push or pull request,
-  # but only for the main branch
-  # push:
-  #   branches:
-  #     - main
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - assigned
+      - unassigned
+      - labeled
+      - unlabeled
+      - opened
+      - edited
+      - reopened
+      - synchronize
+      - ready_for_review
+      - locked
+      - unlocked
+      - review_requested
+      - review_request_
+  workflow_dispatch: 
 
 jobs:
   deploy-book:

diff --git a/environment.yml b/environment.yml
@@ -7,7 +7,7 @@ dependencies:
   - pyqt
   - numpy
   - scipy
-  - numba
+  - numba >= 0.55.1
   - pandas
   - pytables
   - ffmpeg

diff --git a/requirements.txt b/requirements.txt
@@ -12,5 +12,5 @@ toml
 scopecuisine>=0.1.2
 pyqtgraph
 napari
-numba>=0.55.0
+numba >= 0.55.1
 scikit-image
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -4,6 +4,6 @@ pytest
 gitpython
 coverage
 pre-commit
-black
+black==22.3.0
 flake8
 isort