Merge branch '2.0' into tm1

.gitignore

@@ -187,3 +187,6 @@ profiles.yaml
 
 # AWS
 .aws
+
+# Rye
+.rye/

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "viadot2"
-version = "2.1.24"
+version = "2.1.26"
 description = "A simple data ingestion library to guide data flows from some places to other places."
 authors = [
     { name = "acivitillo", email = "[email protected]" },
@@ -23,7 +23,6 @@ dependencies = [
     "openpyxl>=3.0.0",
     "prefect>=2.19.7, <3",
     "prefect-sqlalchemy>=0.4.3",
-    "pandas>=1.2.0",
     "duckdb==1.0.0",
     "requests>=2.32.3",
     "prefect-github>=0.2.7",
@@ -37,6 +36,8 @@ dependencies = [
     "simple-salesforce==1.12.6",
     "pandas-gbq==0.23.1",
     "paramiko>=3.5.0",
+    # awswrangler 2.x. depends on pandas 1.x.
+    "pandas<2.0",
     "TM1py==1.11.3",
 ]
 requires-python = ">=3.10"
@@ -58,10 +59,11 @@ aws = [
     "boto3==1.34.106",
     "dbt-redshift>=1.3, <1.8",
     "minio>=7.0, <8.0",
+    # We need to pin this to 2.x because some code depends on 2.x-only functionality.
     "awswrangler>=2.20.1, <3.0",
     "prefect-aws>=0.4.19",
 ]
-sap = ["pyrfc"]
+sap = ["pyrfc==3.3.1"]
 
 [tool.rye]
 managed = true

requirements-dev.lock

@@ -52,9 +52,9 @@ beautifulsoup4==4.12.3
     # via o365
 bleach==6.1.0
     # via nbconvert
-boto3==1.35.1
+boto3==1.34.106
     # via moto
-botocore==1.35.1
+botocore==1.34.162
     # via boto3
     # via moto
     # via s3transfer
@@ -148,7 +148,7 @@ fastjsonschema==2.20.0
 frozenlist==1.4.1
     # via aiohttp
     # via aiosignal
-fsspec==2024.6.1
+fsspec==2024.6.0
     # via prefect
 ghp-import==2.1.0
     # via mkdocs
@@ -194,7 +194,7 @@ griffe==0.47.0
 grpcio==1.66.1
     # via google-api-core
     # via grpcio-status
-grpcio-status==1.66.1
+grpcio-status==1.62.3
     # via google-api-core
 h11==0.14.0
     # via httpcore
@@ -224,7 +224,7 @@ ijson==3.3.0
     # via tm1py
 imagehash==4.3.1
     # via viadot2
-importlib-metadata==8.3.0
+importlib-metadata==6.11.0
     # via mike
 importlib-resources==6.1.3
     # via mike
@@ -377,7 +377,7 @@ nest-asyncio==1.6.0
     # via ipykernel
 networkx==3.3
     # via visions
-numpy==1.26.4
+numpy==1.23.4
     # via db-dtypes
     # via imagehash
     # via pandas
@@ -393,7 +393,7 @@ o365==2.0.36
 oauthlib==3.2.2
     # via kubernetes
     # via requests-oauthlib
-openpyxl==3.1.5
+openpyxl==3.0.10
     # via viadot2
 orjson==3.10.7
     # via prefect
@@ -409,7 +409,7 @@ packaging==24.1
     # via pytest
 paginate==0.5.6
     # via mkdocs-material
-pandas==2.2.2
+pandas==1.5.1
     # via db-dtypes
     # via mkdocs-table-reader-plugin
     # via pandas-gbq
@@ -423,7 +423,7 @@ paramiko==3.5.0
     # via viadot2
 parso==0.8.4
     # via jedi
-pathspec==0.12.1
+pathspec==0.11.2
     # via mkdocs
     # via prefect
 pendulum==2.1.2
@@ -453,7 +453,7 @@ prompt-toolkit==3.0.47
     # via ipython
 proto-plus==1.24.0
     # via google-api-core
-protobuf==5.28.2
+protobuf==4.25.5
     # via google-api-core
     # via googleapis-common-protos
     # via grpcio-status
@@ -623,7 +623,7 @@ ruamel-yaml-clib==0.2.8
 ruff==0.6.7
 s3transfer==0.10.2
     # via boto3
-scipy==1.14.0
+scipy==1.13.1
     # via imagehash
 sendgrid==6.11.0
     # via viadot2
@@ -673,6 +673,8 @@ starkbank-ecdsa==2.2.0
     # via sendgrid
 tabulate==0.9.0
     # via mkdocs-table-reader-plugin
+tangled-up-in-unicode==0.2.0
+    # via visions
 text-unidecode==1.3
     # via python-slugify
 tinycss2==1.3.0
@@ -719,14 +721,13 @@ typing-extensions==4.12.2
     # via uvicorn
 tzdata==2024.1
     # via o365
-    # via pandas
 tzlocal==5.2
     # via dateparser
     # via o365
     # via trino
 ujson==5.10.0
     # via prefect
-urllib3==2.2.2
+urllib3==1.26.20
     # via botocore
     # via docker
     # via kubernetes
@@ -736,7 +737,7 @@ uvicorn==0.30.6
     # via prefect
 verspec==0.1.0
     # via mike
-visions==0.7.6
+visions==0.7.5
     # via viadot2
 watchdog==4.0.2
     # via mkdocs

requirements.lock

@@ -98,7 +98,7 @@ exceptiongroup==1.2.2
 frozenlist==1.4.1
     # via aiohttp
     # via aiosignal
-fsspec==2024.6.1
+fsspec==2024.6.0
     # via prefect
 google-api-core==2.20.0
     # via google-cloud-bigquery
@@ -137,7 +137,7 @@ griffe==0.47.0
 grpcio==1.66.1
     # via google-api-core
     # via grpcio-status
-grpcio-status==1.66.1
+grpcio-status==1.62.3
     # via google-api-core
 h11==0.14.0
     # via httpcore
@@ -213,7 +213,7 @@ multimethod==1.12
     # via visions
 networkx==3.3
     # via visions
-numpy==1.26.4
+numpy==1.23.4
     # via db-dtypes
     # via imagehash
     # via pandas
@@ -229,7 +229,7 @@ o365==2.0.36
 oauthlib==3.2.2
     # via kubernetes
     # via requests-oauthlib
-openpyxl==3.1.5
+openpyxl==3.0.10
     # via viadot2
 orjson==3.10.7
     # via prefect
@@ -238,7 +238,7 @@ packaging==24.1
     # via google-cloud-bigquery
     # via pandas-gbq
     # via prefect
-pandas==2.2.2
+pandas==1.5.1
     # via db-dtypes
     # via pandas-gbq
     # via viadot2
@@ -247,7 +247,7 @@ pandas-gbq==0.23.1
     # via viadot2
 paramiko==3.5.0
     # via viadot2
-pathspec==0.12.1
+pathspec==0.11.2
     # via prefect
 pendulum==2.1.2
     # via prefect
@@ -265,7 +265,7 @@ prefect-sqlalchemy==0.4.4
     # via viadot2
 proto-plus==1.24.0
     # via google-api-core
-protobuf==5.28.2
+protobuf==4.25.5
     # via google-api-core
     # via googleapis-common-protos
     # via grpcio-status
@@ -382,7 +382,7 @@ ruamel-yaml==0.18.6
     # via prefect
 ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
-scipy==1.14.0
+scipy==1.13.1
     # via imagehash
 sendgrid==6.11.0
     # via viadot2
@@ -422,6 +422,8 @@ sqlparse==0.5.1
     # via sql-metadata
 starkbank-ecdsa==2.2.0
     # via sendgrid
+tangled-up-in-unicode==0.2.0
+    # via visions
 text-unidecode==1.3
     # via python-slugify
 tm1py==1.11.3
@@ -446,20 +448,19 @@ typing-extensions==4.12.2
     # via uvicorn
 tzdata==2024.1
     # via o365
-    # via pandas
 tzlocal==5.2
     # via dateparser
     # via o365
     # via trino
 ujson==5.10.0
     # via prefect
-urllib3==2.2.2
+urllib3==1.26.20
     # via docker
     # via kubernetes
     # via requests
 uvicorn==0.30.6
     # via prefect
-visions==0.7.6
+visions==0.7.5
     # via viadot2
 websocket-client==1.8.0
     # via kubernetes