resolved conflicts

.flake8

@@ -1,16 +1,9 @@
 [flake8]
-ignore = W503, C901, ANN101
 max-line-length = 88
 exclude = cookiecutter
 per-file-ignores =
-    # Don't require docstrings or type annotations in tests
-    # tests/*:D100,D102,D103,DAR,ANN
-    # Don't require docstrings conventions or type annotations in SDK samples
-    # samples/*:ANN,DAR
-    # Don't require docstrings conventions or type annotations in private modules
-    singer_sdk/helpers/_*.py:ANN,DAR,D105
-    # Don't require docstrings conventions in "meta" code
-    # singer_sdk/helpers/_classproperty.py:D105
-max-complexity = 10
+    # Don't require docstrings conventions in private modules
+    singer_sdk/helpers/_*.py:DAR
+    # Disabled some checks in samples code
+    samples/*:DAR
 docstring-convention = google
-allow-star-arg-any = true

.github/CODEOWNERS

@@ -4,17 +4,17 @@
 # nested in that directory, on any level
 
 # Default owners
-* @edgarrmondragon @cjohnhanson @aaronsteers
+* @edgarrmondragon @kgpayne
 
 # CI/CD
 /.github/workflows/ @edgarrmondragon @meltano/engineering
 
 # Docs (General)
 /docs/ @meltano/engineering @meltano/marketing
-/README.md @afolson @tayloramurphy @meltano/engineering @meltano/marketing
+/README.md @tayloramurphy @meltano/engineering @meltano/marketing
 
 # Docs (Contributing)
-/docs/CONTRIBUTING.md @afolson @tayloramurphy @meltano/engineering
+/docs/CONTRIBUTING.md @tayloramurphy @meltano/engineering
 
 # Release Ops (see `/.pyproject.toml` for list of bumped files)
 /cookiecutter/*/*/pyproject.toml @meltano/engineering

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: File a bug report
-title: "[Bug]: <title>"
+title: "bug: <title>"
 labels: ["kind/Bug", "valuestream/SDK"]
 assignees:
   - meltano/engineering
@@ -15,9 +15,16 @@ body:
     attributes:
       label: Singer SDK Version
       description: Version of the library you are using
-      placeholder: "0.8.0"
+      placeholder: "0.31.1"
     validations:
       required: true
+  - type: checkboxes
+    id: regression
+    attributes:
+      label: Is this a regression?
+      description: Meaning this is something that previously worked correctly
+      options:
+        - label: "Yes"
   - type: dropdown
     id: python_version
     attributes:
@@ -38,10 +45,12 @@ body:
       label: Bug scope
       description: Functionality this bug affects
       options:
-        - Taps (catalog, state, stream maps, etc.)
+        - Taps (catalog, state, etc.)
+        - Mapping (stream maps, flattening, etc.)
         - Targets (data type handling, batching, SQL object generation, etc.)
         - Configuration (settings parsing, validation, etc.)
         - CLI (options, error messages, logging, etc.)
+        - Cookiecutter templates
         - Other
     validations:
       required: true

.github/ISSUE_TEMPLATE/docs.yml

@@ -0,0 +1,30 @@
+name: Documentation change
+description: Request a documentation change
+title: "docs: <title>"
+labels: ["Documentation", "valuestream/SDK"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this documentation request!
+  - type: dropdown
+    id: scope
+    attributes:
+      label: Documentation type
+      description: What kind of documentation change are you requesting?
+      options:
+        - Tutorials
+        - How-to guides
+        - Reference
+        - Explanation
+    validations:
+      required: true
+  - type: textarea
+    id: what-you-want
+    attributes:
+      label: Description
+      description: Describe what you want to see in the documentation
+      placeholder: "I was trying to do X, but the documentation didn't tell me how to do it, or it was unclear."
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Request a new feature
-title: "[Feature]: <title>"
+title: "feat: <title>"
 labels: ["kind/Feature", "valuestream/SDK"]
 assignees:
   - meltano/engineering
@@ -16,10 +16,11 @@ body:
       label: Feature scope
       description: Functionality this new feature would impact
       options:
-        - Taps (catalog, state, stream maps, etc.)
-        - Targets (data type handling, batching, SQL object generation, etc.)
+        - Taps (catalog, state, stream maps, tests, etc.)
+        - Targets (data type handling, batching, SQL object generation, tests, etc.)
         - Configuration (settings parsing, validation, etc.)
         - CLI (options, error messages, logging, etc.)
+        - Cookiecutter templates
         - Other
     validations:
       required: true

.github/semantic.yml

@@ -4,7 +4,7 @@
 titleOnly: true
 
 # Provides a custom URL for the "Details" link, which appears next to the success/failure message from the app:
-targetUrl: https://github.com/meltano/sdk/blob/main/CONTRIBUTING.md#semantic-pull-requests
+targetUrl: https://sdk.meltano.com/en/latest/CONTRIBUTING.html#semantic-pull-requests
 
 # The values allowed for the "type" part of the PR title/commit message.
 # e.g. for a PR title/commit message of "feat: add some stuff", the type would be "feat"

.github/stale.yml

@@ -0,0 +1,7 @@
+# This config file extends the shared Meltano GitHub org stale bot config:
+# https://github.com/meltano/.github/blob/main/.github/stale.yml
+
+_extends: .github
+
+# In most cases, this file should not be updated.
+# Updates to the stale bot config should be shared by all Meltano GitHub repositories.

.github/workflows/codeql-analysis.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/constraints.txt

@@ -1,5 +1,5 @@
-pip==22.2.2
-poetry==1.1.14
-virtualenv==20.16.3
-nox==2022.8.7
-nox-poetry==1.0.1
+pip==23.2.1
+poetry==1.6.1
+pre-commit==3.4.0
+nox==2023.4.22
+nox-poetry==1.0.3

.github/workflows/cookiecutter-e2e.yml

@@ -0,0 +1,83 @@
+name: E2E Cookiecutters
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths: ["cookiecutter/**", "e2e-tests/cookiecutters/**"]
+  push:
+    branches: [main]
+    paths: ["cookiecutter/**", "e2e-tests/cookiecutters/**"]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  FORCE_COLOR: "1"
+
+jobs:
+  lint:
+    name: Cookiecutter E2E ${{ matrix.python-version }} ${{ matrix.python-version }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - { python-version: "3.10",  os: "ubuntu-latest" }
+
+    steps:
+    - name: Check out the repository
+      uses: actions/checkout@v4.0.0
+
+    - name: Upgrade pip
+      env:
+        PIP_CONSTRAINT: .github/workflows/constraints.txt
+      run: |
+        pip install pip
+        pip --version
+
+    - name: Install Poetry
+      run: |
+        pipx install poetry
+        poetry --version
+
+    - name: Setup Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4.7.0
+      with:
+        python-version: ${{ matrix.python-version }}
+        architecture: x64
+        cache: 'pip'
+        cache-dependency-path: 'poetry.lock'
+
+    - name: Install pre-commit
+      run: |
+        pipx install pre-commit
+        pre-commit --version
+
+    - name: Install Nox
+      env:
+        PIP_CONSTRAINT: .github/workflows/constraints.txt
+      run: |
+        pipx install --pip-args=--constraint=.github/workflows/constraints.txt nox
+        pipx inject --pip-args=--constraint=.github/workflows/constraints.txt nox nox-poetry
+        nox --version
+
+    - name: Run Nox
+      run: |
+        nox --python=${{ matrix.python-version }} --session=test_cookiecutter
+
+    - name: Upload build artifacts
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        path: |
+          /tmp/tap-*
+          /tmp/target-*
+          /tmp/mapper-*
+          !/tmp/tap-*/.mypy_cache/
+          !/tmp/target-*/.mypy_cache/
+          !/tmp/mapper-*/.mypy_cache/
+          !/tmp/tap-*/.tox/
+          !/tmp/target-*/.tox/
+          !/tmp/mapper-*/.tox/

.github/workflows/dependency-review.yml

@@ -16,12 +16,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v4.0.0
 
       - name: GitHub dependency vulnerability check
         if: ${{ github.event_name == 'pull_request_target' }}
-        # Use this fork until https://github.com/actions/dependency-review-action/pull/165 is merged
-        uses: WillDaSilva/dependency-review-action@main
+        uses: actions/dependency-review-action@v3.0.8
+        with:
+          fail-on-severity: high
 
       - name: FOSSA dependency license check
         run: |

.github/workflows/pr-preview-links.yml

@@ -0,0 +1,17 @@
+name: Read the Docs Pull Request Preview
+
+on:
+  pull_request_target:
+    types:
+    - opened
+
+permissions:
+  pull-requests: write
+
+jobs:
+  pr-preview-links:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: readthedocs/actions/preview@v1
+      with:
+        project-slug: "meltano-sdk"

.github/workflows/release.yml

@@ -4,28 +4,37 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: write  # Needed to upload artifacts to the release
+  id-token: write  # Needed for OIDC PyPI publishing
+
 jobs:
   release:
     name: Publish to PyPI
     runs-on: ubuntu-latest
+    environment: publishing
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3.0.2
+      uses: actions/checkout@v4.0.0
 
     - name: Set up Python
-      uses: actions/setup-python@v4.2.0
+      uses: actions/setup-python@v4.7.0
       with:
         python-version: "3.10"
 
     - name: Upgrade pip
+      env:
+        PIP_CONSTRAINT: .github/workflows/constraints.txt
       run: |
-        pip install --constraint=.github/workflows/constraints.txt pip
+        pip install pip
         pip --version
 
     - name: Install Poetry
+      env:
+        PIP_CONSTRAINT: .github/workflows/constraints.txt
       run: |
-        pipx install --pip-args=--constraint=.github/workflows/constraints.txt poetry
+        pipx install poetry
         poetry --version
 
     - name: Check version
@@ -47,7 +56,4 @@ jobs:
         file_glob: true
 
     - name: Publish
-      uses: pypa/gh-action-pypi-publish@v1.5.1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_SECRET_TOKEN }}
+      uses: pypa/gh-action-pypi-publish@v1.8.10