Merge branch 'master' into dependabot-pip-flowapi-pytest-8.2.0

Flowminder · May 1, 2024 · 3afb651 · 3afb651
2 parents 508dae0 + 46bff22
commit 3afb651
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 125 deletions.
diff --git a/flowauth/Pipfile b/flowauth/Pipfile
@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 flask = "<=2.2.5"
-sqlalchemy = "<1.4.45"
+sqlalchemy = "<2.0.30"
 flask-sqlalchemy = "*"
 flask-login = "*"
 flask-principal = "*"

diff --git a/flowauth/Pipfile.lock b/flowauth/Pipfile.lock
diff --git a/flowauth/frontend/package-lock.json b/flowauth/frontend/package-lock.json
diff --git a/flowdb/testdata/synthetic_data/Pipfile b/flowdb/testdata/synthetic_data/Pipfile
@@ -9,7 +9,7 @@ pandas = "*"
 "psycopg2-binary" = "*"
 structlog = "*"
 tohu = "==0.6.7"
-numpy = "<=1.26.2" # Tohu uses float division where it should be using int division, and hence passes a float where numpy expects an int (https://github.com/maxalbert/tohu/blob/3adf0c58b13ef1e1d716d7d613484d2adc58fb60/tohu/v6/primitive_generators.py#L335)
+numpy = "<=1.26.4" # Tohu uses float division where it should be using int division, and hence passes a float where numpy expects an int (https://github.com/maxalbert/tohu/blob/3adf0c58b13ef1e1d716d7d613484d2adc58fb60/tohu/v6/primitive_generators.py#L335)
                    # This used to work, but doesn't as of numpy 1.26.0 (although I haven't managed to track down the relevant change or find a corresponding issue or changelog entry)
 jinja2 = "*"
 [dev-packages]