Merge branch 'inveniosoftware:master' into tab-bug

inveniosoftware · Apr 18, 2024 · a9ec004 · a9ec004
2 parents 44bf70f + 73204a4
commit a9ec004
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -29,36 +29,24 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-          python-version: [3.7, 3.8, 3.9]
-          requirements-level: [pypi]
+          python-version: ['3.9', '3.10', '3.11', '3.12']
     env:
       EXTRAS: tests
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
-      - name: Generate dependencies
-        run: |
-          pip install wheel requirements-builder
-          requirements-builder -e "$EXTRAS" ${{ matrix.requirements-file }} --level=${{ matrix.requirements-level }} setup.py > .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
-
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('.${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt') }}
+          cache: pip
+          cache-dependency-path: setup.cfg
 
       - name: Install dependencies
         run: |
-          pip install -r .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
           pip install -e .[$EXTRAS]
           pip freeze
 
       - name: Run tests
-        run: |
-          ./run-tests.sh
+        run: ./run-tests.sh
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,16 @@
 Changes
 =======
 
+Version 2.8.5 (released 2024-03-04)
+
+- relax major upper pin of invenio-assets, as v3 only upgrades webpack to
+  v5 and do not introduce breaking changes to Python modules.
+
+Version 2.8.4 (released 2024-03-04)
+
+- bump react-invenio-forms
+- yanked
+
 Version 2.8.3 (released 2024-01-11)
 
 - search: add new config parameter for the default search view

diff --git a/invenio_search_ui/__init__.py b/invenio_search_ui/__init__.py
@@ -327,6 +327,6 @@ def my_record_search():
 
 from .ext import InvenioSearchUI
 
-__version__ = "2.8.3"
+__version__ = "2.8.5"
 
 __all__ = ("__version__", "InvenioSearchUI")
diff --git a/invenio_search_ui/webpack.py b/invenio_search_ui/webpack.py
@@ -41,7 +41,7 @@
                 "redux": "^4.0.0",
                 "redux-thunk": "^2.3.0",
                 "react-searchkit": "^2.0.0",
-                "react-invenio-forms": "^1.0.0",
+                "react-invenio-forms": "^3.0.0",
                 "semantic-ui-css": "^2.4.0",
                 "semantic-ui-react": "^2.1.0",
                 "i18next": "^20.3.0",

diff --git a/setup.cfg b/setup.cfg
@@ -28,13 +28,13 @@ python_requires = >=3.7
 zip_safe = False
 install_requires =
     Babel>=2.8
-    invenio-assets>=2.0.0
-    invenio-base>=1.2.11
+    invenio-assets>=2.0.0,<4.0.0  # v3 only upgrades webpack to v5
+    invenio-base>=1.2.11,<2.0.0
     invenio-i18n>=2.0.0,<3.0.0
 
 [options.extras_require]
 tests =
-    pytest-black>=0.3.0,<0.3.10
+    pytest-black>=0.3.0
     invenio-db>=1.0.8
     invenio-records>=1.0.0
     pytest-invenio>=1.4.11