Merge branch 'develop' into pydantic2

Matgenix · Oct 11, 2023 · e6b4d33 · e6b4d33
2 parents a077df4 + 1cfc5b8
commit e6b4d33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -2,9 +2,10 @@ name: testing
 
 on:
   push:
+    branches:
+    - develop
 
   pull_request:
-    branches: [main]
 
 jobs:
   lint:

diff --git a/pyproject.toml b/pyproject.toml
@@ -26,11 +26,12 @@ classifiers = [
 ]
 requires-python = ">=3.8"
 dependencies =[
-    "jobflow[strict] @ git+ssh://[email protected]/materialsproject/jobflow",
+    "jobflow[strict]",
+    "pydantic<2",
     "fireworks",
     "fabric",
     "tomlkit",
-    "qtoolkit @ git+ssh://[email protected]/matgenix/qtoolkit",  # TODO: Should be updated here when released
+    "qtoolkit",
     "typer",
     "rich",
     "psutil",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,9 +2,10 @@ name: testing @@
     on:
       push:
+        branches:
+        - develop
       pull_request:
-        branches: [main]
     jobs:
       lint:
@@ Expand Down @@