Cian-H/invenio-theme-iform
1
0
Fork 0
mirror of https://github.com/Cian-H/invenio-theme-iform.git synced 2025-12-23 13:11:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

global: migrate to v10

Browse Source
This commit is contained in:
Mojib Wali
2022-10-13 11:32:22 +02:00
committed by GitHub
parent 7cb3b5a83b
commit 19fada5940
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/tests.yml vendored
View File

@@ -31,10 +31,10 @@ jobs:
python-version: [3.8, 3.9] python-version: [3.8, 3.9]
requirements-level: [pypi] requirements-level: [pypi]
db-service: [postgresql13] db-service: [postgresql13]
search-service: [elasticsearch7] search-service: [opensearch2]
include: include:
- search-service: elasticsearch7 - search-service: opensearch2
SEARCH_EXTRAS: "elasticsearch7" SEARCH_EXTRAS: "opensearch2"
env: env:
DB: ${{ matrix.db-service }} DB: ${{ matrix.db-service }}

2
docs/conf.py
View File

@@ -62,7 +62,7 @@ release = __version__
# #
# This is also used if you do content translation via gettext catalogs. # This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases. # Usually you set "language" from the command line for these cases.
language = None language = "en"
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # non-false value, then it is used:

4
invenio_theme_tugraz/search.py
View File

@@ -8,8 +8,8 @@
"""Frontpage records.""" """Frontpage records."""
from elasticsearch_dsl.query import Q
from invenio_search.api import RecordsSearch from invenio_search.api import RecordsSearch
from invenio_search.engine import dsl
class FrontpageRecordsSearch(RecordsSearch): class FrontpageRecordsSearch(RecordsSearch):
@@ -19,7 +19,7 @@ class FrontpageRecordsSearch(RecordsSearch):
"""Default index and filter for frontpage search.""" """Default index and filter for frontpage search."""
index = "rdmrecords-records" index = "rdmrecords-records"
default_filter = Q( default_filter = dsl.Q(
"query_string", "query_string",
query=("access.record:public " "AND versions.is_latest:true"), query=("access.record:public " "AND versions.is_latest:true"),
) )

2
invenio_theme_tugraz/views.py
View File

@@ -10,9 +10,9 @@
from typing import Dict from typing import Dict
from elasticsearch_dsl.utils import AttrDict
from flask import Blueprint, render_template from flask import Blueprint, render_template
from invenio_rdm_records.resources.serializers import UIJSONSerializer from invenio_rdm_records.resources.serializers import UIJSONSerializer
from opensearch_dsl.utils import AttrDict
from .search import FrontpageRecordsSearch from .search import FrontpageRecordsSearch

14
setup.cfg
View File

@@ -40,16 +40,18 @@ install_requires =
Flask-WebpackExt>=1.0.0 Flask-WebpackExt>=1.0.0
invenio-assets>=1.2.7,<1.3.0 invenio-assets>=1.2.7,<1.3.0
invenio-i18n>=1.3.1,<1.4.0 invenio-i18n>=1.3.1,<1.4.0
invenio_config_tugraz>=0.9.0,<0.10.0 invenio_config_tugraz>=0.10.0,<0.11.0
[options.extras_require] [options.extras_require]
tests = tests =
pytest-black>=0.3.0,<0.3.10 pytest-black>=0.3.0,<0.3.10
sphinx>=4.2.0,<5 Sphinx>=4.5.0
pytest-invenio>=1.4.7 pytest-invenio>=1.4.7
invenio-app>=1.3.0,<2.0.0 invenio-app>=1.3.0,<2.0.0
elasticsearch7 = # elasticsearch7 =
invenio-search[elasticsearch7]>=1.4.2,<2.0 # invenio-search[elasticsearch7]>=2.1.0,<3.0.0
opensearch2 =
invenio-search[opensearch2]>=2.1.0,<3.0.0
[options.entry_points] [options.entry_points]
invenio_base.apps = invenio_base.apps =
@@ -98,6 +100,10 @@ output-dir = invenio_theme_tugraz/translations/
[isort] [isort]
profile=black profile=black
[check-manifest]
ignore =
*-requirements.txt
[tool:pytest] [tool:pytest]
addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tugraz --cov-report=term-missing tests invenio_theme_tugraz addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tugraz --cov-report=term-missing tests invenio_theme_tugraz
testpaths = tests invenio_theme_tugraz testpaths = tests invenio_theme_tugraz