Merge branch 'main' of https://github.com/BuzzCutNorman/sdk into 1046…

…-feat-faster-json-dumps-with-msgspec
meltano · Nov 16, 2023 · b723dad · b723dad
2 parents 5cf4e76 + d04d39c
commit b723dad
Show file tree

Hide file tree

Showing 18 changed files with 376 additions and 330 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -15,7 +15,7 @@ body:
     attributes:
       label: Singer SDK Version
       description: Version of the library you are using
-      placeholder: "0.33.0"
+      placeholder: "0.33.1"
     validations:
       required: true
   - type: checkboxes

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -9,7 +9,13 @@ name: "CodeQL"
 on:
   push:
     branches: [ "main" ]
-  pull_request: {}
+    paths:
+      - .github/workflows/codeql-analysis.yml
+      - '**.py'  # Any Python file
+  pull_request:
+    paths:
+      - .github/workflows/codeql-analysis.yml
+      - '**.py'  # Any Python file
   schedule:
     - cron: '37 10 * * 5'
 

diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt
@@ -1,5 +1,5 @@
 pip==23.3.1
-poetry==1.6.1
+poetry==1.7.0
 pre-commit==3.5.0
 nox==2023.4.22
 nox-poetry==1.0.3
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -5,9 +5,6 @@ on:
   workflow_dispatch:
     inputs: {}
 
-env:
-  FOSSA_CLI_INSTALLER_VERSION: '3.3.10'
-
 permissions:
   contents: read
 
@@ -20,22 +17,6 @@ jobs:
 
       - name: GitHub dependency vulnerability check
         if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           fail-on-severity: high
-
-      - name: FOSSA dependency license check
-        run: |
-          # `$FOSSA_CLI_INSTALLER_VERSION` only controls the version of the installer used - the latest version of `fossa-cli` will always be used.
-          curl --no-progress-meter -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/v${FOSSA_CLI_INSTALLER_VERSION}/install-latest.sh | bash
-
-          echo '## FOSSA dependency license check' >> $GITHUB_STEP_SUMMARY
-          echo '' >> $GITHUB_STEP_SUMMARY
-
-          fossa analyze --fossa-api-key ${{ secrets.MELTYBOT_FOSSA_API_KEY }} --revision ${{ github.sha }} |& tee fossa_analyze.log
-          fossa test --fossa-api-key ${{ secrets.MELTYBOT_FOSSA_API_KEY }} --revision ${{ github.sha }}
-
-          TEST_FAILED=$?
-          FOSSA_REPORT_LINK="$(grep -A 1 '[ INFO] View FOSSA Report:' fossa_analyze.log | tail -n 1 | sed -e 's/^\[ INFO\]\s*//')"
-          echo "[FOSSA detected $([ $TEST_FAILED -ne 0 ] && echo -n '' || echo 'no ')issues](${FOSSA_REPORT_LINK})" >> $GITHUB_STEP_SUMMARY
-          exit $TEST_FAILED
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -36,32 +36,26 @@ repos:
         )$
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.27.0
+  rev: 0.27.1
   hooks:
   - id: check-dependabot
   - id: check-github-workflows
   - id: check-readthedocs
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.1
+  rev: v0.1.5
   hooks:
   - id: ruff
     args: [--fix, --exit-non-zero-on-fix, --show-fixes]
     exclude: |
       (?x)^(
         cookiecutter/.*
       )$
-
-- repo: https://github.com/psf/black
-  rev: 23.10.1
-  hooks:
-  - id: black
+  - id: ruff-format
     exclude: |
-        (?x)^(
-            cookiecutter/.*|
-            singer_sdk/helpers/_simpleeval.py|
-            tests/core/test_simpleeval.py
-        )$
+      (?x)^(
+        cookiecutter/.*
+      )$
 
 - repo: https://github.com/pycqa/flake8
   rev: 6.1.0
@@ -76,6 +70,6 @@ repos:
         )$
 
 - repo: https://github.com/python-poetry/poetry
-  rev: 1.6.0
+  rev: 1.7.0
   hooks:
   - id: poetry-check
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.33.1 (2023-11-08)
+
+### 🐛 Fixes
+
+- [#2035](https://github.com/meltano/sdk/issues/2035) Retry all 5xx status codes -- _**Thanks @asamasoma!**_
+
 ## v0.33.0 (2023-10-12)
 
 ### ✨ New

diff --git a/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml b/cookiecutter/mapper-template/{{cookiecutter.mapper_id}}/pyproject.toml
@@ -22,12 +22,12 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4"
-singer-sdk = { version="~=0.33.0" }
+singer-sdk = { version="~=0.33.1" }
 fs-s3fs = { version = "~=1.1.1", optional = true }
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.4.0"
-singer-sdk = { version="~=0.33.0", extras = ["testing"] }
+singer-sdk = { version="~=0.33.1", 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
@@ -29,7 +29,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4"
-singer-sdk = { version="~=0.33.0" }
+singer-sdk = { version="~=0.33.1" }
 fs-s3fs = { version = "~=1.1.1", optional = true }
 {%- if cookiecutter.stream_type in ["REST", "GraphQL"] %}
 requests = "~=2.31.0"
@@ -40,7 +40,7 @@ cached-property = "~=1" # Remove after Python 3.7 support is dropped
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.4.0"
-singer-sdk = { version="~=0.33.0", extras = ["testing"] }
+singer-sdk = { version="~=0.33.1", 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
@@ -29,15 +29,15 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4"
-singer-sdk = { version="~=0.33.0" }
+singer-sdk = { version="~=0.33.1" }
 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.33.0", extras = ["testing"] }
+singer-sdk = { version="~=0.33.1", extras = ["testing"] }
 
 [tool.poetry.extras]
 s3 = ["fs-s3fs"]

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 author = "Meltano Core Team and Contributors"
 
 # The full version, including alpha/beta/rc tags
-release = "0.33.0"
+release = "0.33.1"
 
 
 # -- General configuration ---------------------------------------------------
@@ -43,6 +43,7 @@
     "myst_parser",
     "sphinx_reredirects",
     "sphinx_inline_tabs",
+    "notfound.extension",
 ]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/docs/stream_maps.md b/docs/stream_maps.md
@@ -47,6 +47,24 @@ three distinct fields:
 - `user__last_name`
 - `user__id`
 
+#### Flattening Example
+
+````{tab} meltano.yml
+```yaml
+flattening_enabled: true
+flattening_max_depth: 1   # flatten only top-level properties
+```
+````
+
+````{tab} JSON
+```json
+{
+  "flattening_enabled": true,
+  "flattening_max_depth": 1
+}
+```
+````
+
 ## Out-of-scope capabilities
 
 These capabilities are all out of scope _by design_: