From eb97568525759fceecc5f465fdcee3b10cc5fac4 Mon Sep 17 00:00:00 2001 From: Chenyu Li Date: Thu, 12 Oct 2023 09:26:10 -0700 Subject: [PATCH 1/2] remove pre versions that has latest --- .../requirements/v1.1.pre.requirements.txt | 15 --------------- .../requirements/v1.2.pre.requirements.txt | 14 -------------- .../requirements/v1.3.pre.requirements.txt | 14 -------------- .../requirements/v1.4.pre.requirements.txt | 16 ---------------- .../requirements/v1.5.pre.requirements.txt | 15 --------------- .../requirements/v1.6.pre.requirements.txt | 16 ---------------- 6 files changed, 90 deletions(-) delete mode 100644 release_creation/bundle/requirements/v1.1.pre.requirements.txt delete mode 100644 release_creation/bundle/requirements/v1.2.pre.requirements.txt delete mode 100644 release_creation/bundle/requirements/v1.3.pre.requirements.txt delete mode 100644 release_creation/bundle/requirements/v1.4.pre.requirements.txt delete mode 100644 release_creation/bundle/requirements/v1.5.pre.requirements.txt delete mode 100644 release_creation/bundle/requirements/v1.6.pre.requirements.txt diff --git a/release_creation/bundle/requirements/v1.1.pre.requirements.txt b/release_creation/bundle/requirements/v1.1.pre.requirements.txt deleted file mode 100644 index 0acb7a39..00000000 --- a/release_creation/bundle/requirements/v1.1.pre.requirements.txt +++ /dev/null @@ -1,15 +0,0 @@ -git+https://github.com/dbt-labs/dbt-core.git@1.1.latest#egg=dbt-core&subdirectory=core --no-binary dbt-postgres -git+https://github.com/dbt-labs/dbt-core.git@1.1.latest#egg=dbt-postgres&subdirectory=plugins/postgres -git+https://github.com/dbt-labs/dbt-bigquery.git@1.1.latest#egg=dbt-bigquery -git+https://github.com/dbt-labs/dbt-snowflake.git@1.1.latest#egg=dbt-snowflake -git+https://github.com/dbt-labs/dbt-redshift.git@1.1.latest#egg=dbt-redshift -git+https://github.com/dbt-labs/dbt-spark.git@1.1.latest#egg=dbt-spark[PyHive,ODBC] -dbt-databricks~=1.1.5 -dbt-trino~=1.1.0 -dbt-rpc~=0.1.0b1 -grpcio-status~=1.47.0 -pyarrow!=12.0.1 -pyasn1-modules~=0.2.1 -pyodbc~=4.0.32 -snowflake-connector-python~=3.0,!=3.0.4 -wheel diff --git a/release_creation/bundle/requirements/v1.2.pre.requirements.txt b/release_creation/bundle/requirements/v1.2.pre.requirements.txt deleted file mode 100644 index efd496c9..00000000 --- a/release_creation/bundle/requirements/v1.2.pre.requirements.txt +++ /dev/null @@ -1,14 +0,0 @@ -git+https://github.com/dbt-labs/dbt-core.git@1.2.latest#egg=dbt-core&subdirectory=core --no-binary dbt-postgres -git+https://github.com/dbt-labs/dbt-core.git@1.2.latest#egg=dbt-postgres&subdirectory=plugins/postgres -git+https://github.com/dbt-labs/dbt-bigquery.git@1.2.latest#egg=dbt-bigquery -git+https://github.com/dbt-labs/dbt-snowflake.git@1.2.latest#egg=dbt-snowflake -git+https://github.com/dbt-labs/dbt-redshift.git@1.2.latest#egg=dbt-redshift -git+https://github.com/dbt-labs/dbt-spark.git@1.2.latest#egg=dbt-spark[PyHive,ODBC] -dbt-databricks==1.2.3 -dbt-trino~=1.2.0 -dbt-rpc~=0.1.1 -grpcio-status~=1.47.0 -pyarrow!=12.0.1 -pyasn1-modules~=0.2.1 -pyodbc==4.0.32 --no-binary pyodbc -snowflake-connector-python~=3.0,!=3.0.4 \ No newline at end of file diff --git a/release_creation/bundle/requirements/v1.3.pre.requirements.txt b/release_creation/bundle/requirements/v1.3.pre.requirements.txt deleted file mode 100644 index abe80887..00000000 --- a/release_creation/bundle/requirements/v1.3.pre.requirements.txt +++ /dev/null @@ -1,14 +0,0 @@ -git+https://github.com/dbt-labs/dbt-core.git@1.3.latest#egg=dbt-core&subdirectory=core --no-binary dbt-postgres -git+https://github.com/dbt-labs/dbt-core.git@1.3.latest#egg=dbt-postgres&subdirectory=plugins/postgres -git+https://github.com/dbt-labs/dbt-bigquery.git@1.3.latest#egg=dbt-bigquery -git+https://github.com/dbt-labs/dbt-snowflake.git@1.3.latest#egg=dbt-snowflake -git+https://github.com/dbt-labs/dbt-redshift.git@1.3.latest#egg=dbt-redshift -git+https://github.com/dbt-labs/dbt-spark.git@1.3.latest#egg=dbt-spark[PyHive,ODBC] -dbt-databricks~=1.3.0 -dbt-trino~=1.3.0 -dbt-rpc~=0.1.1 --pre -grpcio-status~=1.47.0 -pyarrow!=12.0.1 -pyasn1-modules~=0.2.1 -pyodbc==4.0.32 --no-binary pyodbc -snowflake-connector-python~=3.0,!=3.0.4 \ No newline at end of file diff --git a/release_creation/bundle/requirements/v1.4.pre.requirements.txt b/release_creation/bundle/requirements/v1.4.pre.requirements.txt deleted file mode 100644 index b94655f1..00000000 --- a/release_creation/bundle/requirements/v1.4.pre.requirements.txt +++ /dev/null @@ -1,16 +0,0 @@ ---pre -setuptools -git+https://github.com/dbt-labs/dbt-core.git@1.4.latest#egg=dbt-core&subdirectory=core --no-binary dbt-postgres -git+https://github.com/dbt-labs/dbt-core.git@1.4.latest#egg=dbt-postgres&subdirectory=plugins/postgres -git+https://github.com/dbt-labs/dbt-bigquery.git@1.4.latest#egg=dbt-bigquery -git+https://github.com/dbt-labs/dbt-snowflake.git@1.4.latest#egg=dbt-snowflake -git+https://github.com/dbt-labs/dbt-redshift.git@1.4.latest#egg=dbt-redshift -git+https://github.com/dbt-labs/dbt-spark.git@1.4.latest#egg=dbt-spark[PyHive,ODBC] -dbt-databricks~=1.4.0b1 -dbt-trino~=1.4.0 -dbt-rpc~=0.1.3b1 -grpcio-status~=1.47.0 -pyarrow~=12.0.0,!=12.0.1 -pyasn1-modules~=0.2.1 -pyodbc==4.0.32 --no-binary pyodbc -snowflake-connector-python~=3.0,!=3.0.4 \ No newline at end of file diff --git a/release_creation/bundle/requirements/v1.5.pre.requirements.txt b/release_creation/bundle/requirements/v1.5.pre.requirements.txt deleted file mode 100644 index 10c951e1..00000000 --- a/release_creation/bundle/requirements/v1.5.pre.requirements.txt +++ /dev/null @@ -1,15 +0,0 @@ -git+https://github.com/dbt-labs/dbt-core.git@1.5.latest#egg=dbt-core&subdirectory=core --no-binary dbt-postgres -git+https://github.com/dbt-labs/dbt-core.git@1.5.latest#egg=dbt-postgres&subdirectory=plugins/postgres -git+https://github.com/dbt-labs/dbt-bigquery.git@1.5.latest#egg=dbt-bigquery -git+https://github.com/dbt-labs/dbt-snowflake.git@1.5.latest#egg=dbt-snowflake -git+https://github.com/dbt-labs/dbt-redshift.git@1.5.latest#egg=dbt-redshift -git+https://github.com/dbt-labs/dbt-spark.git@1.5.latest#egg=dbt-spark[PyHive,ODBC] -dbt-databricks~=1.5.0 --pre -dbt-trino~=1.5.0 --pre -dbt-rpc~=0.1.3b1 -grpcio-status~=1.47.0 -pyasn1-modules~=0.2.1 -pyodbc==4.0.39 --no-binary pyodbc -pyarrow~=12.0.0,!=12.0.1 -snowflake-connector-python[secure-local-storage]~=3.0,!=3.0.4 -snowflake-connector-python~=3.0,!=3.0.4 \ No newline at end of file diff --git a/release_creation/bundle/requirements/v1.6.pre.requirements.txt b/release_creation/bundle/requirements/v1.6.pre.requirements.txt deleted file mode 100644 index 8dcb2f66..00000000 --- a/release_creation/bundle/requirements/v1.6.pre.requirements.txt +++ /dev/null @@ -1,16 +0,0 @@ -git+https://github.com/dbt-labs/dbt-core.git@1.6.latest#egg=dbt-core&subdirectory=core --no-binary dbt-postgres -git+https://github.com/dbt-labs/dbt-core.git@1.6.latest#egg=dbt-postgres&subdirectory=plugins/postgres -git+https://github.com/dbt-labs/dbt-bigquery.git@1.6.latest#egg=dbt-bigquery -git+https://github.com/dbt-labs/dbt-snowflake.git@1.6.latest#egg=dbt-snowflake -git+https://github.com/dbt-labs/dbt-redshift.git@1.6.latest#egg=dbt-redshift -git+https://github.com/dbt-labs/dbt-spark.git@1.6.latest#egg=dbt-spark[PyHive,ODBC] -dbt-spark[PyHive,ODBC]~=1.6.0b2 -dbt-databricks~=1.6.0rc2 -dbt-trino~=1.6.0rc2 -dbt-rpc~=0.4.1 -dbt-fabric~=1.6.0 -grpcio-status~=1.47.0 -pyasn1-modules~=0.2.1 -pyarrow~=12.0.0,!=12.0.1 -pyodbc==4.0.39 --no-binary pyodbc -snowflake-connector-python~=3.0,!=3.0.4 From 03707f4296d83ff95262425f2949d83460adef53 Mon Sep 17 00:00:00 2001 From: Chenyu Li Date: Fri, 3 Nov 2023 17:09:27 -0700 Subject: [PATCH 2/2] pr_feedback --- test/integration/bundle/test_create.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/bundle/test_create.py b/test/integration/bundle/test_create.py index eb7a4979..0eafe0e1 100644 --- a/test/integration/bundle/test_create.py +++ b/test/integration/bundle/test_create.py @@ -9,8 +9,8 @@ @pytest.mark.parametrize(argnames="test_version", - argvalues=["0.0.0", "1.3.0", "1.4.0", "1.5.0rc1", "1.5.0", - "1.6.0b2", "1.6.0", "1.7.0b1", "1.7.0"]) + argvalues=["0.0.0", "1.3.0", "1.4.0", "1.5.0", + "1.6.0", "1.7.0b1", "1.7.0"]) def test_generate_bundle_creates_a_bundle_with_valid_version(test_version): created_assets = generate_bundle(Version.coerce(test_version)) for asset_name, asset_location in created_assets.items():