From 6d4ff51f0baf82f59852b290ace8718fdfa8d5db Mon Sep 17 00:00:00 2001 From: dlbrittain Date: Sat, 14 Sep 2024 14:21:46 -0700 Subject: [PATCH 1/3] feat: update requirements --- emannotationschemas/schemas/base.py | 2 +- requirements.in | 8 ++++ requirements.txt | 70 +++++++++++++++++++++++++---- 3 files changed, 71 insertions(+), 9 deletions(-) create mode 100644 requirements.in diff --git a/emannotationschemas/schemas/base.py b/emannotationschemas/schemas/base.py index 6487ebb..ee2db32 100644 --- a/emannotationschemas/schemas/base.py +++ b/emannotationschemas/schemas/base.py @@ -3,7 +3,7 @@ import marshmallow as mm import numpy as np from geoalchemy2.shape import to_shape -from geoalchemy2.types import WKBElement, WKTElement +from geoalchemy2.elements import WKBElement, WKTElement from marshmallow import INCLUDE from sqlalchemy.sql.sqltypes import Integer diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..3ba474f --- /dev/null +++ b/requirements.in @@ -0,0 +1,8 @@ +marshmallow +marshmallow-jsonschema +numpy +jsonschema +SQLAlchemy +shapely +geoalchemy2 +flask-cors \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index edb4c09..49f1c80 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,62 @@ -marshmallow==3.5.1 -marshmallow-jsonschema==0.10.0 -numpy>=1.18.4 -jsonschema<4.0 -SQLAlchemy<1.4 -shapely==2.0.3 -geoalchemy2>=0.11.1, <0.12.0 -flask-cors==3.0.10 \ No newline at end of file +# This file was autogenerated by uv via the following command: +# uv pip compile requirements.in +attrs==24.2.0 + # via + # jsonschema + # referencing +blinker==1.8.2 + # via flask +click==8.1.7 + # via flask +flask==3.0.3 + # via flask-cors +flask-cors==4.0.1 + # via -r requirements.in +geoalchemy2==0.15.2 + # via -r requirements.in +greenlet==3.0.3 + # via sqlalchemy +itsdangerous==2.2.0 + # via flask +jinja2==3.1.4 + # via flask +jsonschema==4.23.0 + # via -r requirements.in +jsonschema-specifications==2023.12.1 + # via jsonschema +markupsafe==2.1.5 + # via + # jinja2 + # werkzeug +marshmallow==3.22.0 + # via + # -r requirements.in + # marshmallow-jsonschema +marshmallow-jsonschema==0.13.0 + # via -r requirements.in +numpy==2.1.0 + # via + # -r requirements.in + # shapely +packaging==24.1 + # via + # geoalchemy2 + # marshmallow +referencing==0.35.1 + # via + # jsonschema + # jsonschema-specifications +rpds-py==0.20.0 + # via + # jsonschema + # referencing +shapely==2.0.6 + # via -r requirements.in +sqlalchemy==2.0.32 + # via + # -r requirements.in + # geoalchemy2 +typing-extensions==4.12.2 + # via sqlalchemy +werkzeug==3.0.4 + # via flask From 6b3d4c53aa7650674886dfbbef8eef969a3f3057 Mon Sep 17 00:00:00 2001 From: dlbrittain Date: Sat, 14 Sep 2024 14:30:40 -0700 Subject: [PATCH 2/3] fix: update requirements --- requirements.in | 3 ++- requirements.txt | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/requirements.in b/requirements.in index 3ba474f..bc36b10 100644 --- a/requirements.in +++ b/requirements.in @@ -5,4 +5,5 @@ jsonschema SQLAlchemy shapely geoalchemy2 -flask-cors \ No newline at end of file +flask-cors +pandas \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 49f1c80..4c0a7fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,11 +10,11 @@ click==8.1.7 # via flask flask==3.0.3 # via flask-cors -flask-cors==4.0.1 +flask-cors==5.0.0 # via -r requirements.in geoalchemy2==0.15.2 # via -r requirements.in -greenlet==3.0.3 +greenlet==3.1.0 # via sqlalchemy itsdangerous==2.2.0 # via flask @@ -34,14 +34,21 @@ marshmallow==3.22.0 # marshmallow-jsonschema marshmallow-jsonschema==0.13.0 # via -r requirements.in -numpy==2.1.0 +numpy==2.1.1 # via # -r requirements.in + # pandas # shapely packaging==24.1 # via # geoalchemy2 # marshmallow +pandas==2.2.2 + # via -r requirements.in +python-dateutil==2.9.0.post0 + # via pandas +pytz==2024.2 + # via pandas referencing==0.35.1 # via # jsonschema @@ -52,11 +59,15 @@ rpds-py==0.20.0 # referencing shapely==2.0.6 # via -r requirements.in -sqlalchemy==2.0.32 +six==1.16.0 + # via python-dateutil +sqlalchemy==2.0.34 # via # -r requirements.in # geoalchemy2 typing-extensions==4.12.2 # via sqlalchemy +tzdata==2024.1 + # via pandas werkzeug==3.0.4 # via flask From b5e153e464b38606d5a6f45c7d86564665f3db44 Mon Sep 17 00:00:00 2001 From: dlbrittain Date: Sat, 14 Sep 2024 14:44:19 -0700 Subject: [PATCH 3/3] fix: numpy and pandas issue --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index bc36b10..6483551 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ marshmallow marshmallow-jsonschema -numpy +numpy<2 jsonschema SQLAlchemy shapely diff --git a/requirements.txt b/requirements.txt index 4c0a7fa..de310ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,7 +34,7 @@ marshmallow==3.22.0 # marshmallow-jsonschema marshmallow-jsonschema==0.13.0 # via -r requirements.in -numpy==2.1.1 +numpy==1.26.4 # via # -r requirements.in # pandas