Merge branch 'main' into gaugup/AddSupport3.12

gaugup · web-flow · commit c96d14a8ba7d · 2024-04-16T15:12:47.000-07:00
diff --git a/.github/workflows/code-scan.yml b/.github/workflows/code-scan.yml
@@ -27,7 +27,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/.github/workflows/notebook-linting.yml b/.github/workflows/notebook-linting.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.11
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.11"
     - name: Install dependencies
diff --git a/.github/workflows/notebook-tests.yml b/.github/workflows/notebook-tests.yml
@@ -23,9 +23,9 @@ jobs:
           - os: macos-latest
             python-version: "3.7"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }} ${{ matrix.os }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Upgrade pip
diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.11
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.11"
     - name: Install dependencies
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -15,9 +15,9 @@ jobs:
       max-parallel: 5
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: Add conda to system path
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -23,9 +23,9 @@ jobs:
           - os: macos-latest
             python-version: "3.7"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }} ${{ matrix.os }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Upgrade pip
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -13,9 +13,9 @@ jobs:
       # IMPORTANT: this permission is mandatory for trusted publishing
       id-token: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
diff --git a/requirements-deeplearning.txt b/requirements-deeplearning.txt
@@ -1,2 +1,2 @@
-tensorflow>=1.13.1
+tensorflow>=1.13.1,<2.16.1
 torch
diff --git a/tests/test_notebooks.py b/tests/test_notebooks.py
@@ -98,7 +98,7 @@ def _notebook_run(filepath):
 
 
 @pytest.mark.parametrize("notebook_filename", get_notebook_parameter_list())
-@pytest.mark.notebook_tests()
+@pytest.mark.notebook_tests
 def test_notebook(notebook_filename):
     _check_notebook_cell_outputs(NOTEBOOKS_PATH + notebook_filename)
     errors = _notebook_run(NOTEBOOKS_PATH + notebook_filename)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-tensorflow>=1.13.1`
	`1`	`+tensorflow>=1.13.1,<2.16.1`
`2`	`2`	`torch`