Merge remote-tracking branch 'origin/master' into add-git

Author: mmarchetti

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         include:
         - os: macos-latest
           python-version: '3.9'

.github/workflows/snyk.yml

@@ -16,14 +16,34 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Run Snyk (setup.py)
-        uses: snyk/actions/python@master
+      # - name: Run Snyk (setup.py)
+      #   uses: snyk/actions/python@master
+      #   with:
+      #     command: monitor
+      #     args: --file=setup.py --package-manager=pip --project-name=setup.py --org=${{ env.SNYK_ORG }}
+
+      # - name: Run Snyk (requirements.txt)
+      #   uses: snyk/actions/python@master
+      #   with:
+      #     command: monitor
+      #     args: --file=requirements.txt --package-manager=pip --project-name=requirements.txt --org=${{ env.SNYK_ORG }}
+
+      # On Oct 2 2023, the steps using snyk/actions/python@master started failing with "undefined".
+      # Nothing obvious changed in our code or in the Snyk action or Docker image.
+      # Setting up and running snyk generically seems to work, so we'll go with that.
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
-          command: monitor
-          args: --file=setup.py --package-manager=pip --project-name=setup.py --org=${{ env.SNYK_ORG }}
+          python-version: '3.11'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - uses: snyk/actions/setup@master
+
+      - name: Run Snyk (setup.py)
+        run: snyk monitor --file="setup.py" --package-manager=pip --project-name="setup.py" --org=${{ env.SNYK_ORG }}
 
       - name: Run Snyk (requirements.txt)
-        uses: snyk/actions/python@master
-        with:
-          command: monitor
-          args: --file=requirements.txt --package-manager=pip --project-name=requirements.txt --org=${{ env.SNYK_ORG }}
+        run: snyk monitor --file="requirements.txt" --package-manager=pip --project-name="requirements.txt" --org=${{ env.SNYK_ORG }}

.gitignore

@@ -29,3 +29,4 @@ coverage.xml
 
 # Temporary dev files
 vetiver-testing/rsconnect_api_keys.json
+/pip-wheel-metadata/

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - The `https_proxy` environment variable is recognized as a synonym for
   `HTTPS_PROXY`.
+- When adding a new server, the initial request now includes an
+  Authorization header containing the API key. This is needed
+  for Connect installations behind a proxy that only passes
+  authenticated requests.
 - Common environment directories (`env, venv, .env, .venv`) are no longer
   excluded by name. Environments are detected by the presence of a python
   executable in `bin` or `Scripts` and excluded.
@@ -29,6 +33,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   [Connect administrator guide](https://docs.posit.co/connect/admin/content-management/git-backed/)
   and
   [Connect user guide](https://docs.posit.co/connect/user/git-backed/) for details.
+- Added a new verbose logging level. Specifying `-v` on the command line uses this
+  new level. Currently this will cause filenames to be logged as they are added to
+  a bundle. To enable maximum verbosity (debug level), use `-vv`.
+
+### Changed
+- Removing experimental support for Conda. Connect does not support restoring Conda environments.
 
 ## [1.20.0] - 2023-09-11
 

conftest.py

@@ -9,13 +9,13 @@
 
 
 def pytest_addoption(parser):
-    parser.addoption(
-        "--vetiver", action="store_true", default=False, help="run vetiver tests"
-    )
+    parser.addoption("--vetiver", action="store_true", default=False, help="run vetiver tests")
+
 
 def pytest_configure(config):
     config.addinivalue_line("markers", "vetiver: test for vetiver interaction")
 
+
 def pytest_collection_modifyitems(config, items):
     if config.getoption("--vetiver"):
         return

docs/patch_admonitions.py

@@ -26,6 +26,7 @@
 
 import sys
 
+
 def rewrite(gh_admonition, mkdocs_admonition, lines):
     for i in range(len(lines)):
         line = lines[i]
@@ -35,7 +36,7 @@ def rewrite(gh_admonition, mkdocs_admonition, lines):
         # The start of the GitHub admonition MUST be on its own line.
         if gh_admonition == line.rstrip():
             lines[i] = f"!!! { mkdocs_admonition }\n"
-            for j in range(i+1, len(lines)):
+            for j in range(i + 1, len(lines)):
                 if lines[j].startswith("> "):
                     text = lines[j][2:]
                     lines[j] = f"    { text }"
@@ -44,6 +45,7 @@ def rewrite(gh_admonition, mkdocs_admonition, lines):
                     break
     return lines
 
+
 lines = sys.stdin.readlines()
 
 lines = rewrite("> **Note**", "note", lines)

mock_connect/mock_connect/main.py

@@ -155,7 +155,6 @@ def python_settings():
     return {
         "installations": [{"version": v}],
         "api_enabled": True,
-        "conda_enabled": False,
     }
 
 

my-shiny-app/app.py

@@ -5,10 +5,12 @@
     ui.output_text_verbatim("txt", placeholder=True),
 )
 
+
 def server(input, output, session):
     @output()
     @render_text()
     def txt():
         return f"n*2 is {input.n() * 2}"
 
-app = App(app_ui, server)
+
+app = App(app_ui, server)

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"]
+requires = ["setuptools>=61", "wheel", "setuptools_scm[toml]>=3.4"]
 
 [tool.black]
 line-length = 120

requirements.txt

@@ -15,6 +15,7 @@ pytest
 pytest-cov
 pytest-mypy
 semver>=2.0.0,<3.0.0
+setuptools>=61
 setuptools_scm
 six>=1.14.0
 toml