From 9641dbe92aa1ebf0e3e310bc1df0dfd11240dd69 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Mon, 4 Nov 2024 21:29:13 +0100 Subject: [PATCH 1/2] Dependencies: Use more relaxed dependency pinning, to reduce Dependabot --- application/cratedb-toolkit/requirements.txt | 2 +- by-dataframe/dask/requirements.txt | 4 ++-- by-dataframe/pandas/requirements.txt | 4 ++-- framework/gradio/requirements.txt | 2 +- framework/streamlit/requirements.txt | 2 +- testing/native/python-pytest/requirements.txt | 5 ++--- testing/native/python-unittest/requirements.txt | 5 ++--- testing/testcontainers/python-pytest/requirements.txt | 4 ++-- testing/testcontainers/python-unittest/requirements.txt | 4 ++-- topic/machine-learning/automl/requirements-dev.txt | 4 ++-- topic/machine-learning/automl/requirements.txt | 2 +- topic/machine-learning/llama-index/requirements.txt | 2 +- topic/machine-learning/llm-langchain/requirements.txt | 2 +- topic/machine-learning/mlops-mlflow/requirements-dev.txt | 4 ++-- topic/timeseries/requirements-dev.txt | 2 +- topic/timeseries/requirements.txt | 4 ++-- 16 files changed, 25 insertions(+), 27 deletions(-) diff --git a/application/cratedb-toolkit/requirements.txt b/application/cratedb-toolkit/requirements.txt index 2501fcb2..cfd620db 100644 --- a/application/cratedb-toolkit/requirements.txt +++ b/application/cratedb-toolkit/requirements.txt @@ -1 +1 @@ -cratedb-toolkit[influxdb,mongodb]==0.0.29 +cratedb-toolkit[influxdb,mongodb]>=0.0.29 diff --git a/by-dataframe/dask/requirements.txt b/by-dataframe/dask/requirements.txt index 9d501791..9911a7b7 100644 --- a/by-dataframe/dask/requirements.txt +++ b/by-dataframe/dask/requirements.txt @@ -2,5 +2,5 @@ click<9 colorlog<7 dask[dataframe]>=2024.4.1 # Python 3.11.9 breaks previous Dask distributed>=2024.4.1 # Python 3.11.9 breaks previous Dask -pueblo==0.0.10 -sqlalchemy-cratedb==0.40.0 +pueblo>=0.0.10 +sqlalchemy-cratedb>=0.40.0 diff --git a/by-dataframe/pandas/requirements.txt b/by-dataframe/pandas/requirements.txt index 84f4782b..73b34f36 100644 --- a/by-dataframe/pandas/requirements.txt +++ b/by-dataframe/pandas/requirements.txt @@ -1,5 +1,5 @@ click<9 colorlog<7 pandas==2.2.* -pueblo==0.0.10 -sqlalchemy-cratedb==0.40.0 +pueblo>=0.0.10 +sqlalchemy-cratedb>=0.40.0 diff --git a/framework/gradio/requirements.txt b/framework/gradio/requirements.txt index 3dd2254d..cb66b4ab 100644 --- a/framework/gradio/requirements.txt +++ b/framework/gradio/requirements.txt @@ -1,2 +1,2 @@ gradio==4.* -sqlalchemy-cratedb==0.40.0 +sqlalchemy-cratedb>=0.40.0 diff --git a/framework/streamlit/requirements.txt b/framework/streamlit/requirements.txt index 5749c155..e208e288 100644 --- a/framework/streamlit/requirements.txt +++ b/framework/streamlit/requirements.txt @@ -1,2 +1,2 @@ streamlit==1.* -sqlalchemy-cratedb==0.40.0 +sqlalchemy-cratedb>=0.40.0 diff --git a/testing/native/python-pytest/requirements.txt b/testing/native/python-pytest/requirements.txt index 02acb1c6..d819f4d9 100644 --- a/testing/native/python-pytest/requirements.txt +++ b/testing/native/python-pytest/requirements.txt @@ -1,4 +1,3 @@ -crash==0.31.5 +crash>=0.31.5 pytest<9 -pytest-cratedb==0.4.0 -setuptools # Temporary, until next cr8 release. +pytest-cratedb>=0.4.0 diff --git a/testing/native/python-unittest/requirements.txt b/testing/native/python-unittest/requirements.txt index 1f18b3ea..2f910e01 100644 --- a/testing/native/python-unittest/requirements.txt +++ b/testing/native/python-unittest/requirements.txt @@ -1,3 +1,2 @@ -cr8==0.27.2 -crash==0.31.5 -setuptools # Temporary, until next cr8 release. +cr8>=0.27.2 +crash>=0.31.5 diff --git a/testing/testcontainers/python-pytest/requirements.txt b/testing/testcontainers/python-pytest/requirements.txt index c7fc70c0..daa273fc 100644 --- a/testing/testcontainers/python-pytest/requirements.txt +++ b/testing/testcontainers/python-pytest/requirements.txt @@ -1,3 +1,3 @@ -crash==0.31.5 -cratedb-toolkit[testing]==0.0.29 +crash>=0.31.5 +cratedb-toolkit[testing]>=0.0.29 pytest<9 diff --git a/testing/testcontainers/python-unittest/requirements.txt b/testing/testcontainers/python-unittest/requirements.txt index 28d13180..c60cd324 100644 --- a/testing/testcontainers/python-unittest/requirements.txt +++ b/testing/testcontainers/python-unittest/requirements.txt @@ -1,2 +1,2 @@ -crash==0.31.5 -cratedb-toolkit[testing]==0.0.29 +crash>=0.31.5 +cratedb-toolkit[testing]>=0.0.29 diff --git a/topic/machine-learning/automl/requirements-dev.txt b/topic/machine-learning/automl/requirements-dev.txt index 382251be..e6851c5c 100644 --- a/topic/machine-learning/automl/requirements-dev.txt +++ b/topic/machine-learning/automl/requirements-dev.txt @@ -1,6 +1,6 @@ # Real. -cratedb-toolkit[io]==0.0.29 -pueblo[notebook,testing]==0.0.10 +cratedb-toolkit[io]>=0.0.29 +pueblo[notebook,testing]>=0.0.10 # Development. # cratedb-toolkit[io] @ git+https://github.com/crate-workbench/cratedb-toolkit.git@7f3a493 diff --git a/topic/machine-learning/automl/requirements.txt b/topic/machine-learning/automl/requirements.txt index 1f2822b8..0226a7d9 100644 --- a/topic/machine-learning/automl/requirements.txt +++ b/topic/machine-learning/automl/requirements.txt @@ -5,7 +5,7 @@ pycaret[models,parallel,test]==3.3.2 pydantic<3 python-dotenv<2 sqlalchemy==2.* -sqlalchemy-cratedb==0.40.0 +sqlalchemy-cratedb>=0.40.0 # Development. # mlflow-cratedb @ git+https://github.com/crate-workbench/mlflow-cratedb.git@main diff --git a/topic/machine-learning/llama-index/requirements.txt b/topic/machine-learning/llama-index/requirements.txt index 26bea470..13fcc2de 100644 --- a/topic/machine-learning/llama-index/requirements.txt +++ b/topic/machine-learning/llama-index/requirements.txt @@ -86,7 +86,7 @@ six==1.16.0 sniffio==1.3.1 soupsieve==2.6 SQLAlchemy==2.0.36 -sqlalchemy-cratedb==0.40.0 +sqlalchemy-cratedb>=0.40.0 striprtf==0.0.26 tenacity==8.5.0 tiktoken==0.8.0 diff --git a/topic/machine-learning/llm-langchain/requirements.txt b/topic/machine-learning/llm-langchain/requirements.txt index c65cb60f..e40324a7 100644 --- a/topic/machine-learning/llm-langchain/requirements.txt +++ b/topic/machine-learning/llm-langchain/requirements.txt @@ -11,7 +11,7 @@ python-dotenv<2 requests<3 requests-cache<2 sqlalchemy==2.* -sqlalchemy-cratedb==0.40.0 +sqlalchemy-cratedb>=0.40.0 unstructured<0.17 # Development. diff --git a/topic/machine-learning/mlops-mlflow/requirements-dev.txt b/topic/machine-learning/mlops-mlflow/requirements-dev.txt index cd80700e..265a653b 100644 --- a/topic/machine-learning/mlops-mlflow/requirements-dev.txt +++ b/topic/machine-learning/mlops-mlflow/requirements-dev.txt @@ -1,6 +1,6 @@ # Real. -cratedb-toolkit[io]==0.0.29 -pueblo[notebook,testing]==0.0.10 +cratedb-toolkit[io]>=0.0.29 +pueblo[notebook,testing]>=0.0.10 # Development. # cratedb-toolkit[io] @ git+https://github.com/crate-workbench/cratedb-toolkit.git@7f3a493 diff --git a/topic/timeseries/requirements-dev.txt b/topic/timeseries/requirements-dev.txt index 4f01a47d..7d1f629d 100644 --- a/topic/timeseries/requirements-dev.txt +++ b/topic/timeseries/requirements-dev.txt @@ -1,5 +1,5 @@ # Real. -pueblo[notebook,testing]==0.0.10 +pueblo[notebook,testing]>=0.0.10 # Development. # pueblo[notebook,testing] @ git+https://github.com/pyveci/pueblo.git@amo/testbook diff --git a/topic/timeseries/requirements.txt b/topic/timeseries/requirements.txt index 52efb055..56145da7 100644 --- a/topic/timeseries/requirements.txt +++ b/topic/timeseries/requirements.txt @@ -1,7 +1,7 @@ -cratedb-toolkit[datasets]==0.0.29 +cratedb-toolkit[datasets]>=0.0.29 refinitiv-data<1.7 pandas==2.0.* pycaret==3.3.2 pydantic<3 sqlalchemy==2.0.* -sqlalchemy-cratedb==0.40.0 +sqlalchemy-cratedb>=0.40.0 From 519110be46038f632da91584ca80cb6fa37b06f1 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Mon, 4 Nov 2024 21:30:17 +0100 Subject: [PATCH 2/2] Dependencies: Use crate>=1.0.0.dev2 for validation purposes --- application/apache-kafka-flink-streaming/requirements.txt | 2 +- application/apache-superset/requirements.txt | 1 + application/cratedb-toolkit/requirements.txt | 1 + by-dataframe/dask/requirements.txt | 1 + by-dataframe/pandas/requirements.txt | 1 + by-language/python-dbapi/requirements.txt | 2 +- by-language/python-sqlalchemy/requirements.txt | 1 + testing/native/python-pytest/requirements.txt | 1 + testing/native/python-unittest/requirements.txt | 1 + testing/testcontainers/python-pytest/requirements.txt | 1 + testing/testcontainers/python-unittest/requirements.txt | 1 + topic/machine-learning/automl/requirements.txt | 1 + topic/machine-learning/llama-index/requirements.txt | 2 +- topic/machine-learning/llm-langchain/requirements.txt | 1 + topic/timeseries/requirements.txt | 1 + 15 files changed, 15 insertions(+), 3 deletions(-) diff --git a/application/apache-kafka-flink-streaming/requirements.txt b/application/apache-kafka-flink-streaming/requirements.txt index b19c7ae6..1d2e5e02 100644 --- a/application/apache-kafka-flink-streaming/requirements.txt +++ b/application/apache-kafka-flink-streaming/requirements.txt @@ -5,7 +5,7 @@ avro-python3==1.10.2 certifi==2024.2.2 charset-normalizer==3.3.2 cloudpickle==2.2.1 -crate==0.34.0 +crate>=1.0.0.dev2 crcmod==1.7 dill==0.3.1.1 dnspython==2.6.1 diff --git a/application/apache-superset/requirements.txt b/application/apache-superset/requirements.txt index 2099a81a..22b657ee 100644 --- a/application/apache-superset/requirements.txt +++ b/application/apache-superset/requirements.txt @@ -1,2 +1,3 @@ apache-superset +crate>=1.0.0.dev2 sqlalchemy-cratedb>=0.36.1,<1 diff --git a/application/cratedb-toolkit/requirements.txt b/application/cratedb-toolkit/requirements.txt index cfd620db..6e8daa3c 100644 --- a/application/cratedb-toolkit/requirements.txt +++ b/application/cratedb-toolkit/requirements.txt @@ -1 +1,2 @@ +crate>=1.0.0.dev2 cratedb-toolkit[influxdb,mongodb]>=0.0.29 diff --git a/by-dataframe/dask/requirements.txt b/by-dataframe/dask/requirements.txt index 9911a7b7..2121bb87 100644 --- a/by-dataframe/dask/requirements.txt +++ b/by-dataframe/dask/requirements.txt @@ -1,5 +1,6 @@ click<9 colorlog<7 +crate>=1.0.0.dev2 dask[dataframe]>=2024.4.1 # Python 3.11.9 breaks previous Dask distributed>=2024.4.1 # Python 3.11.9 breaks previous Dask pueblo>=0.0.10 diff --git a/by-dataframe/pandas/requirements.txt b/by-dataframe/pandas/requirements.txt index 73b34f36..578034bf 100644 --- a/by-dataframe/pandas/requirements.txt +++ b/by-dataframe/pandas/requirements.txt @@ -1,5 +1,6 @@ click<9 colorlog<7 +crate>=1.0.0.dev2 pandas==2.2.* pueblo>=0.0.10 sqlalchemy-cratedb>=0.40.0 diff --git a/by-language/python-dbapi/requirements.txt b/by-language/python-dbapi/requirements.txt index 9ac17d57..80a00975 100644 --- a/by-language/python-dbapi/requirements.txt +++ b/by-language/python-dbapi/requirements.txt @@ -1 +1 @@ -crate +crate>=1.0.0.dev2 diff --git a/by-language/python-sqlalchemy/requirements.txt b/by-language/python-sqlalchemy/requirements.txt index 1e53d67b..97a53e98 100644 --- a/by-language/python-sqlalchemy/requirements.txt +++ b/by-language/python-sqlalchemy/requirements.txt @@ -1,5 +1,6 @@ click<9 colorlog<7 +crate>=1.0.0.dev2 pueblo>=0.0.7 sqlalchemy>=2,<2.1 sqlalchemy-cratedb[all] @ git+https://github.com/crate-workbench/sqlalchemy-cratedb@amo/postgresql-async diff --git a/testing/native/python-pytest/requirements.txt b/testing/native/python-pytest/requirements.txt index d819f4d9..78f637c4 100644 --- a/testing/native/python-pytest/requirements.txt +++ b/testing/native/python-pytest/requirements.txt @@ -1,3 +1,4 @@ crash>=0.31.5 +crate>=1.0.0.dev2 pytest<9 pytest-cratedb>=0.4.0 diff --git a/testing/native/python-unittest/requirements.txt b/testing/native/python-unittest/requirements.txt index 2f910e01..dcc2fedf 100644 --- a/testing/native/python-unittest/requirements.txt +++ b/testing/native/python-unittest/requirements.txt @@ -1,2 +1,3 @@ cr8>=0.27.2 crash>=0.31.5 +crate>=1.0.0.dev2 diff --git a/testing/testcontainers/python-pytest/requirements.txt b/testing/testcontainers/python-pytest/requirements.txt index daa273fc..e3d51bc5 100644 --- a/testing/testcontainers/python-pytest/requirements.txt +++ b/testing/testcontainers/python-pytest/requirements.txt @@ -1,3 +1,4 @@ crash>=0.31.5 +crate>=1.0.0.dev2 cratedb-toolkit[testing]>=0.0.29 pytest<9 diff --git a/testing/testcontainers/python-unittest/requirements.txt b/testing/testcontainers/python-unittest/requirements.txt index c60cd324..4db9f764 100644 --- a/testing/testcontainers/python-unittest/requirements.txt +++ b/testing/testcontainers/python-unittest/requirements.txt @@ -1,2 +1,3 @@ crash>=0.31.5 +crate>=1.0.0.dev2 cratedb-toolkit[testing]>=0.0.29 diff --git a/topic/machine-learning/automl/requirements.txt b/topic/machine-learning/automl/requirements.txt index 0226a7d9..3131d7b6 100644 --- a/topic/machine-learning/automl/requirements.txt +++ b/topic/machine-learning/automl/requirements.txt @@ -1,4 +1,5 @@ # Real. +crate>=1.0.0.dev2 mlflow-cratedb==2.14.1 plotly<5.25 pycaret[models,parallel,test]==3.3.2 diff --git a/topic/machine-learning/llama-index/requirements.txt b/topic/machine-learning/llama-index/requirements.txt index 13fcc2de..ad580877 100644 --- a/topic/machine-learning/llama-index/requirements.txt +++ b/topic/machine-learning/llama-index/requirements.txt @@ -11,7 +11,7 @@ certifi==2024.8.30 cffi==1.17.1 charset-normalizer==3.4.0 click==8.1.7 -crate==1.0.0.dev1 +crate>=1.0.0.dev2 cryptography==43.0.3 dataclasses-json==0.6.7 Deprecated==1.2.14 diff --git a/topic/machine-learning/llm-langchain/requirements.txt b/topic/machine-learning/llm-langchain/requirements.txt index e40324a7..e8dc5d0d 100644 --- a/topic/machine-learning/llm-langchain/requirements.txt +++ b/topic/machine-learning/llm-langchain/requirements.txt @@ -1,5 +1,6 @@ # Real. crash +crate>=1.0.0.dev2 google-cloud-aiplatform<2 langchain-google-vertexai<3 langchain-openai<0.3 diff --git a/topic/timeseries/requirements.txt b/topic/timeseries/requirements.txt index 56145da7..4406d205 100644 --- a/topic/timeseries/requirements.txt +++ b/topic/timeseries/requirements.txt @@ -1,3 +1,4 @@ +crate>=1.0.0.dev2 cratedb-toolkit[datasets]>=0.0.29 refinitiv-data<1.7 pandas==2.0.*