Merge branch 'main' into main

nteract · Nov 1, 2023 · aa1a66a · aa1a66a
2 parents dc2213b + 65693c3
commit aa1a66a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: "actions/checkout@v3"
+      - uses: "actions/checkout@v4"
       - uses: "actions/setup-python@v4"
         with:
           python-version: ${{ matrix.python-version }}
@@ -51,7 +51,7 @@ jobs:
     env:
       TOXENV: ${{ matrix.toxenv }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/docs/extending-entry-points.rst b/docs/extending-entry-points.rst
@@ -200,7 +200,7 @@ class:
     class CustomEngine(papermill.engines.Engine):
 
         @classmethod
-        execute_managed_notebook(cls, nb_man, kernel_name, **kwargs):
+        def execute_managed_notebook(cls, nb_man, kernel_name, **kwargs):
             pass
 
 ``nb_man`` is a |nbformat.NotebookNode|_, and ``kernel_name`` is a string. Your

diff --git a/papermill/translators.py b/papermill/translators.py
@@ -194,6 +194,8 @@ def codify(cls, parameters, comment='Parameters'):
                 content = black.format_str(content, mode=fm)
             except ImportError:
                 logger.debug("Black is not installed, parameters won't be formatted")
+            except AttributeError as aerr:
+                logger.warning(f"Black encountered an error, skipping formatting ({aerr})")
         return content
 
     @classmethod

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@ def read_reqs(fname, folder=None):
 github_reqs = read_reqs('github.txt', folder='requirements')
 docs_only_reqs = read_reqs('requirements.txt', folder='docs')
 black_reqs = ['black >= 19.3b0']
-all_reqs = s3_reqs + azure_reqs + gcs_reqs + hdfs_reqs + black_reqs
+all_reqs = s3_reqs + azure_reqs + gcs_reqs + hdfs_reqs + github_reqs + black_reqs
 docs_reqs = all_reqs + docs_only_reqs
 # Temporarily remove hdfs_reqs from dev deps until the pyarrow package is available for Python 3.12
 dev_reqs = read_reqs('dev.txt', folder='requirements') + s3_reqs + azure_reqs + gcs_reqs + black_reqs # all_reqs