Merge branch 'main' into 1969-bug-trying-to-append-null-for-optional-…

…fields-in-json-schema-helpers-should-only-warn-not-crash-the-tap
meltano · Sep 22, 2023 · 490f5fe · 490f5fe
2 parents 8edc2ec + 68be7ce
commit 490f5fe
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 376 deletions.
diff --git a/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml b/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml
@@ -21,13 +21,13 @@ packages = [
 {%- endif %}
 
 [tool.poetry.dependencies]
-python = "<3.12,>=3.7.1"
-singer-sdk = { version="^0.32.0b2" }
-fs-s3fs = { version = "^1.1.1", optional = true }
+python = ">=3.7.1,<4"
+singer-sdk = { version="~=0.32.0b2" }
+fs-s3fs = { version = "~=1.1.1", optional = true }
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.0"
-singer-sdk = { version="^0.30.0", extras = ["testing"] }
+pytest = ">=7.4.0"
+singer-sdk = { version="~=0.32.0b2", extras = ["testing"] }
 
 [tool.poetry.extras]
 s3 = ["fs-s3fs"]

diff --git a/cookiecutter/tap-template/{{cookiecutter.tap_id}}/pyproject.toml b/cookiecutter/tap-template/{{cookiecutter.tap_id}}/pyproject.toml
@@ -20,19 +20,19 @@ packages = [
 {%- endif %}
 
 [tool.poetry.dependencies]
-python = "<3.12,>=3.7.1"
-singer-sdk = { version="^0.32.0b2" }
-fs-s3fs = { version = "^1.1.1", optional = true }
+python = ">=3.7.1,<4"
+singer-sdk = { version="~=0.32.0b2" }
+fs-s3fs = { version = "~=1.1.1", optional = true }
 {%- if cookiecutter.stream_type in ["REST", "GraphQL"] %}
-requests = "^2.31.0"
+requests = "~=2.31.0"
 {%- endif %}
 {%- if cookiecutter.auth_method in ("OAuth2", "JWT") %}
-cached-property = "^1" # Remove after Python 3.7 support is dropped
+cached-property = "~=1" # Remove after Python 3.7 support is dropped
 {%- endif %}
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.0"
-singer-sdk = { version="^0.32.0b2", extras = ["testing"] }
+pytest = ">=7.4.0"
+singer-sdk = { version="~=0.32.0b2", extras = ["testing"] }
 
 [tool.poetry.extras]
 s3 = ["fs-s3fs"]

diff --git a/cookiecutter/target-template/{{cookiecutter.target_id}}/pyproject.toml b/cookiecutter/target-template/{{cookiecutter.target_id}}/pyproject.toml
@@ -20,16 +20,16 @@ packages = [
 {%- endif %}
 
 [tool.poetry.dependencies]
-python = "<3.12,>=3.7.1"
-singer-sdk = { version="^0.32.0b2" }
-fs-s3fs = { version = "^1.1.1", optional = true }
+python = ">=3.7.1,<4"
+singer-sdk = { version="~=0.32.0b2" }
+fs-s3fs = { version = "~=1.1.1", optional = true }
 {%- if cookiecutter.serialization_method != "SQL" %}
-requests = "^2.31.0"
+requests = "~=2.31.0"
 {%- endif %}
 
 [tool.poetry.dev-dependencies]
-pytest = "^7.4.0"
-singer-sdk = { version="^0.32.0b2", extras = ["testing"] }
+pytest = ">=7.4.0"
+singer-sdk = { version="~=0.32.0b2", extras = ["testing"] }
 
 [tool.poetry.extras]
 s3 = ["fs-s3fs"]

diff --git a/noxfile.py b/noxfile.py
@@ -45,7 +45,6 @@
     "pytest-snapshot",
     "pytest-durations",
     "freezegun",
-    "pandas",
     "pyarrow",
     "requests-mock",
     # Cookiecutter tests