Merge branch 'main' into 1046-feat-faster-json-dumps-with-msgspec

BuzzCutNorman · Feb 19, 2024 · e08d7ca · e08d7ca
2 parents 32be3a9 + 04dd773
commit e08d7ca
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 48 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -13,7 +13,7 @@ body:
     attributes:
       label: Singer SDK Version
       description: Version of the library you are using
-      placeholder: "0.35.1"
+      placeholder: "0.35.2"
     validations:
       required: true
   - type: checkboxes

diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt
@@ -2,6 +2,6 @@ pip==24.0
 poetry==1.7.1
 poetry-plugin-export==1.6.0
 poetry-dynamic-versioning==1.2.0
-pre-commit==3.6.1
+pre-commit==3.6.2
 nox==2023.4.22
 nox-poetry==1.0.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.35.2 (2024-02-19)
+
+### 🐛 Fixes
+
+- [#2252](https://github.com/meltano/sdk/issues/2252) Null type is now correctly appended as `{"type": "null"}` to `oneOf` types
+
 ## v0.35.1 (2024-02-15)
 
 ### 🐛 Fixes

diff --git a/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml b/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml
@@ -31,12 +31,12 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.8"
-singer-sdk = { version="~=0.35.1"{{ ', extras = ["faker"]' if cookiecutter.faker_extra }} }
+singer-sdk = { version="~=0.35.2"{{ ', extras = ["faker"]' if cookiecutter.faker_extra }} }
 fs-s3fs = { version = "~=1.1.1", optional = true }
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.4.0"
-singer-sdk = { version="~=0.35.1", extras = ["testing"] }
+singer-sdk = { version="~=0.35.2", 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
@@ -31,15 +31,15 @@ packages = [
 [tool.poetry.dependencies]
 python = ">=3.8"
 importlib-resources = { version = "==6.1.*", python = "<3.9" }
-singer-sdk = { version="~=0.35.1"{{ ', extras = ["faker"]' if cookiecutter.faker_extra }} }
+singer-sdk = { version="~=0.35.2"{{ ', extras = ["faker"]' if cookiecutter.faker_extra }} }
 fs-s3fs = { version = "~=1.1.1", optional = true }
 {%- if cookiecutter.stream_type in ["REST", "GraphQL"] %}
 requests = "~=2.31.0"
 {%- endif %}
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.4.0"
-singer-sdk = { version="~=0.35.1", extras = ["testing"] }
+singer-sdk = { version="~=0.35.2", 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
@@ -30,15 +30,15 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.8"
-singer-sdk = { version="~=0.35.1"{{ ', extras = ["faker"]' if cookiecutter.faker_extra }} }
+singer-sdk = { version="~=0.35.2"{{ ', extras = ["faker"]' if cookiecutter.faker_extra }} }
 fs-s3fs = { version = "~=1.1.1", optional = true }
 {%- if cookiecutter.serialization_method != "SQL" %}
 requests = "~=2.31.0"
 {%- endif %}
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.4.0"
-singer-sdk = { version="~=0.35.1", extras = ["testing"] }
+singer-sdk = { version="~=0.35.2", extras = ["testing"] }
 
 [tool.poetry.extras]
 s3 = ["fs-s3fs"]

diff --git a/docs/conf.py b/docs/conf.py
@@ -27,7 +27,7 @@
 author = "Meltano Core Team and Contributors"
 
 # The full version, including alpha/beta/rc tags
-release = "0.35.1"
+release = "0.35.2"
 
 
 # -- General configuration -------------------------------------------------------------

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -172,7 +172,7 @@ norecursedirs = "cookiecutter"
 
 [tool.commitizen]
 name = "cz_version_bump"
-version = "0.35.1"
+version = "0.35.2"
 changelog_merge_prerelease = true
 prerelease_offset = 1
 tag_format = "v$major.$minor.$patch$prerelease"

diff --git a/singer_sdk/helpers/_typing.py b/singer_sdk/helpers/_typing.py
@@ -60,7 +60,7 @@ def append_type(type_dict: dict, new_type: str) -> dict:
         return result
 
     if "oneOf" in result:
-        result["oneOf"].append(new_type)
+        result["oneOf"].append({"type": new_type})
         return result
 
     if "type" in result:

diff --git a/tests/core/test_typing.py b/tests/core/test_typing.py
@@ -341,7 +341,7 @@ def test_to_sql_type(jsonschema_type, expected):
         ),
         pytest.param(
             {"oneOf": [{"type": "integer"}, {"type": "number"}]},
-            {"oneOf": [{"type": "integer"}, {"type": "number"}, "null"]},
+            {"oneOf": [{"type": "integer"}, {"type": "number"}, {"type": "null"}]},
             id="oneOf",
         ),
     ],