Merge branch 'main' into 2089-just-in-time-install

.github/CODEOWNERS

@@ -6,18 +6,18 @@
 
 # Default owners
 
-- @edgarrmondragon @WillDaSilva
+* @edgarrmondragon @WillDaSilva
 
 # CI
 .github/actions/ @WillDaSilva @meltano/engineering
 .github/workflows/ @WillDaSilva @meltano/engineering
 
 # Docs (General)
-/docs/ @sbalnojan @tayloramurphy @meltano/engineering @meltano/marketing
-/README.md @sbalnojan @tayloramurphy @meltano/engineering @meltano/marketing
+/docs/ @tayloramurphy @meltano/engineering @meltano/marketing
+/README.md @tayloramurphy @meltano/engineering @meltano/marketing
 
 # Docs (Contributing)
-/CONTRIBUTING.md @sbalnojan @tayloramurphy @meltano/engineering
+/CONTRIBUTING.md @tayloramurphy @meltano/engineering
 
 # Integration tests
 /docs/example-library/ @meltano/product @meltano/engineering

.github/actions/docker-build-scan-push/action.yml

@@ -31,10 +31,10 @@ runs:
   using: 'composite'
   steps:
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
 
     - name: Prepare the tags
       id: prepare-tags
@@ -43,7 +43,7 @@ runs:
         echo "tags=$(echo "${{ inputs.tags }}" | sed "s/^/${{ inputs.registry }}\/meltano\/meltano:/" | tr '\n' ',')" >> $GITHUB_OUTPUT
 
     - name: Build the image for all supported architectures
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: docker/meltano
         build-args: |
@@ -60,7 +60,7 @@ runs:
         push: false
 
     - name: Load the amd64 image for scanning
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: docker/meltano
         build-args: |
@@ -87,7 +87,7 @@ runs:
         severity-cutoff: "critical"
 
     - name: Upload Anchore scan SARIF report
-      uses: github/codeql-action/upload-sarif@v2
+      uses: github/codeql-action/upload-sarif@v3
       with:
         sarif_file: ${{ steps.anchore-scan.outputs.sarif }}
         category: python-${{ inputs.python-version }}
@@ -105,15 +105,15 @@ runs:
         [ "$NUM_ISSUES" = '0' ] # Error if there are any alerts that are neither fixed nor dismissed
 
     - name: Login to the registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
         password: ${{ inputs.password }}
 
     - name: Push the scanned image to the registry
       if: ${{ inputs.push == 'true' }}
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: docker/meltano
         build-args: |

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.6
 
     - name: Install Poetry
       env:
@@ -73,7 +73,7 @@ jobs:
     environment: publishing
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.6
 
     - name: Download artifacts
       uses: actions/download-artifact@v4

.github/workflows/codeql-analysis.yml

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

.github/workflows/dependency-review.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
 
       - name: GitHub dependency vulnerability check
         if: ${{ github.event_name == 'pull_request_target' }}

.github/workflows/docker_publish.yml

@@ -51,7 +51,7 @@ jobs:
         echo "dry_run=${{ format('{0}', github.event.inputs.dry_run) || env.DEFAULT_DRY_RUN }}" >> $GITHUB_ENV
         echo "registry=${{ github.event.inputs.registry || env.DEFAULT_REGISTRY }}" >> $GITHUB_ENV
 
-    - uses: actions/checkout@v4.1.4
+    - uses: actions/checkout@v4.1.6
 
     - name: Get Meltano version
       id: get-meltano-version

.github/workflows/integration_tests.yml

@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.6
 
     - name: Install Poetry
       env:

.github/workflows/lint_snowplow_schemas.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
 
       - name: Iglu Schema Lint
         uses: ./.github/actions/igluctl-lint

.github/workflows/resources/constraints.txt

@@ -1,4 +1,4 @@
 nox==2024.4.15
 nox-poetry==1.0.3
 pip==24.0
-poetry==1.8.2
+poetry==1.8.3

.github/workflows/test.yml

@@ -92,7 +92,7 @@ jobs:
 
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.6
 
     - name: Install Poetry
       env:
@@ -247,7 +247,7 @@ jobs:
     needs: tests
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.6
 
     - name: Install Poetry
       env:
@@ -292,7 +292,7 @@ jobs:
         fail_ci_if_error: true
         files: ./coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
-      uses: codecov/codecov-action@v4.3.1
+      uses: codecov/codecov-action@v4.4.0
 
   mypy:
     name: "Static type checking"
@@ -302,7 +302,7 @@ jobs:
 
     steps:
     - name: Check out the repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.6
 
     - name: Install Poetry
       env:

.github/workflows/version_bump.yml

@@ -34,7 +34,7 @@ jobs:
       pull-requests: write  # to create and update PRs
 
     steps:
-    - uses: actions/checkout@v4.1.4
+    - uses: actions/checkout@v4.1.6
       with:
         fetch-depth: 0
 

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
       - id: debug-statements
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.2
+    rev: 0.28.4
     hooks:
       - id: check-metaschema
         name: validate JSON schemas against meta schemas
@@ -74,7 +74,7 @@ repos:
           - "prettier@3.0.0"
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.3
+    rev: v0.4.4
     hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix, --show-fixes]

CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Changelog](http://keepachangelog.com/).
 
+## v3.4.2 (2024-05-15)
+
+### 🐛 Fixes
+
+- [#8542](https://github.com/meltano/meltano/issues/8542) State from interrupted pipelines or using the `--merge-state` flag no longer causes crashes
+
+### 📚 Documentation Improvements
+
+- [#8544](https://github.com/meltano/meltano/issues/8544) Added YAML docs examples of global and per-plugin `python` executable option
+
+## v3.4.1 (2024-05-06)
+
 ## v3.4.1b1 (2024-05-06)
 
 ### 🐛 Fixes

docs/docs/reference/command-line-interface.md

@@ -190,6 +190,8 @@ Then regardless of the Python version used when the plugin is installed, `tap-gi
 
 - `--force-install`: Ignore the required Python version declared by the plugins.
 
+- `--python`: The Python version to use for the plugin. See [the setting documentation](/reference/settings#python) for more information.
+
 ### Using `add` with Environments
 
 The `add` command does not run relative to a [Meltano Environment](https://docs.meltano.com/concepts/environments). The `--environment` flag and [`default_environment` setting](https://docs.meltano.com/concepts/environments#default-environments) in your `meltano.yml` file will be ignored if set.

docs/docs/reference/settings.mdx

@@ -31,14 +31,28 @@ to list all available settings with their names, environment variables, and curr
 
 ### <a name="plugin-python"></a>`python`
 
-The python version to use for this plugin, specified as a path, or as the name of an executable to find within a directory in `$PATH`.
+The python version to use for this plugin, specified as a path, or as the name of an executable to find within a directory in `$PATH`. You can set it at the time you add a plugin using [`meltano add --python <python>`](/reference/command-line-interface#add).
 
 If not specified, [the top-level `python` setting will be used](#project-python), or if it is not set, the python executable that was used to run Meltano will be used (within a separate virtual environment).
 
 This setting only applies when creating new virtual environments. If you've already created a virtual environment and you'd like to use a new Python version for it, you'll need to delete it from within `.meltano/`, then run `meltano install` for that plugin again.
 
 This setting only applies to base plugins, which have their own virtual environment. Inherited plugins necessarily use the same virtual environment (and thus, the Python version) as their base plugin.
 
+Example:
+
+```yaml
+plugins:
+  extractors:
+  - name: tap-gitlab
+    variant: meltanolabs
+    python: /path/to/python3.10
+  loaders:
+  - name: target-postgres
+    variant: meltanolabs
+    python: python3.10 # if it's in your $PATH
+```
+
 ## Your Meltano project
 
 These are settings specific to [your Meltano project](/concepts/project).
@@ -57,6 +71,15 @@ This setting only applies when creating new virtual environments. If you've alre
 
 This setting only applies to base plugins, which have their own virtual environment. Inherited plugins necessarily use the same virtual environment (and thus, the Python version) as their base plugin.
 
+Example:
+
+```yaml
+python: /path/to/python3.10 # or just python3.10 if it's in your $PATH
+plugins:
+  extractors: ...
+  loaders: ...
+```
+
 ### <a name="send_anonymous_usage_stats"></a>`send_anonymous_usage_stats`
 
 - [Environment variable](../guide/configuration#configuring-settings): `MELTANO_SEND_ANONYMOUS_USAGE_STATS`

docs/docusaurus.config.js

@@ -207,9 +207,10 @@ const config = {
           hideable: true,
         },
       },
+      // https://www.docusaurus.io/docs/search
       algolia: {
         appId: 'RH6DR0I7R7',
-        apiKey: '44af7e07962ccb69a33accdb699d3347',
+        apiKey: '6d3c8732a3b6feb9fdae6de7b68de90e',
         indexName: 'meltanodocs',
         // contextualSearch: true,
         // searchParameters: {},

docs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docs.meltano.com",
   "license": "MIT",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "https://meltano.com",
   "private": true,
   "scripts": {