diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ed355e7ef..651917fe4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: python-version: [3.8, 3.9] requirements-level: [pypi] db-service: [postgresql14] - search-service: [opensearch2,elasticsearch7] + search-service: [opensearch2] include: - db-service: postgresql14 DB_EXTRAS: "postgresql" diff --git a/invenio_communities/communities/schema.py b/invenio_communities/communities/schema.py index 5ac9deac8..7051431e2 100644 --- a/invenio_communities/communities/schema.py +++ b/invenio_communities/communities/schema.py @@ -174,7 +174,6 @@ class CommunityThemeConfigSchema(Schema): mainHeaderBackgroundColor = fields.Str() - class CommunityThemeSchema(Schema): """Community theme schema.""" diff --git a/invenio_communities/templates/semantic-ui/invenio_communities/details/header.html b/invenio_communities/templates/semantic-ui/invenio_communities/details/header.html index ec1d9c6d9..fe36a96ae 100644 --- a/invenio_communities/templates/semantic-ui/invenio_communities/details/header.html +++ b/invenio_communities/templates/semantic-ui/invenio_communities/details/header.html @@ -104,14 +104,15 @@

{{ community.metadata.title }}

-
- - - {{ _("New upload") }} - + {%- if not community_use_jinja_header %} + + + {{ _("New upload") }} + + {% endif %} {% if permissions.can_moderate %} {{ community.metadata.title }}
diff --git a/setup.cfg b/setup.cfg index 9b3049c80..e9531d4e9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,8 +41,6 @@ tests = invenio-db[postgresql,mysql]>=1.0.14,<2.0.0 pytest-invenio>=2.1.4,<3.0.0 sphinx>=4.5.0 -elasticsearch7 = - invenio-search[elasticsearch7]>=2.1.0,<3.0.0 opensearch1 = invenio-search[opensearch1]>=2.1.0,<3.0.0 opensearch2 = diff --git a/tests/conftest.py b/tests/conftest.py index f1eea4899..e26a8ff2d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -79,12 +79,12 @@ def build(cls, **kwargs): @pytest.fixture(scope="module") def app_config(app_config): """Override pytest-invenio app_config fixture.""" - app_config["RECORDS_REFRESOLVER_CLS"] = ( - "invenio_records.resolver.InvenioRefResolver" - ) - app_config["RECORDS_REFRESOLVER_STORE"] = ( - "invenio_jsonschemas.proxies.current_refresolver_store" - ) + app_config[ + "RECORDS_REFRESOLVER_CLS" + ] = "invenio_records.resolver.InvenioRefResolver" + app_config[ + "RECORDS_REFRESOLVER_STORE" + ] = "invenio_jsonschemas.proxies.current_refresolver_store" # Variable not used. We set it to silent warnings app_config["JSONSCHEMAS_HOST"] = "not-used" @@ -106,9 +106,9 @@ def app_config(app_config): app_config["COMMUNITIES_IDENTITIES_CACHE_REDIS_URL"] = "redis://localhost:6379/4" # Cache handler - app_config["COMMUNITIES_IDENTITIES_CACHE_HANDLER"] = ( - "invenio_communities.cache.redis:IdentityRedisCache" - ) + app_config[ + "COMMUNITIES_IDENTITIES_CACHE_HANDLER" + ] = "invenio_communities.cache.redis:IdentityRedisCache" app_config["MAIL_DEFAULT_SENDER"] = "test@invenio-rdm-records.org" @@ -135,9 +135,9 @@ def app_config(app_config): ] # Extending preferences schemas, to include notification preferences. Should not matter for most test cases - app_config["ACCOUNTS_USER_PREFERENCES_SCHEMA"] = ( - UserPreferencesNotificationsSchema() - ) + app_config[ + "ACCOUNTS_USER_PREFERENCES_SCHEMA" + ] = UserPreferencesNotificationsSchema() app_config["USERS_RESOURCES_SERVICE_SCHEMA"] = NotificationsUserSchema # Users are verified by default. This will disable the automatic creation of moderation requests after publishing a record.