Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump major #232

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,7 @@ on:

jobs:
build-n-publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel babel
- name: Build package
run: |
python setup.py compile_catalog sdist bdist_wheel
- name: pypi-publish
uses: pypa/[email protected]
with:
user: __token__

password: ${{ secrets.pypi_token }}

uses: inveniosoftware/workflows/.github/workflows/pypi-publish.yml@master
secrets: inherit
with:
babel-compile-catalog: true
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
..
Copyright (C) 2022-2024 CERN.
Copyright (C) 2024 Graz University of Technology.

invenio-administration is free software; you can redistribute it and/or
modify it under the terms of the MIT License; see LICENSE file for more
Expand All @@ -8,6 +9,12 @@
Changes
=======

Version v3.0.0 (released 2024-12-10)

- tests: remove invenio-admin dependency
- setup: change to reusable workflows
- setup: bump major dependencies

Version v2.9.0 (released 2024-11-11)

- admin: change default # of results from 10 to 20
Expand Down
3 changes: 2 additions & 1 deletion invenio_administration/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2022-2024 CERN.
# Copyright (C) 2024 Graz University of Technology.
#
# invenio-administration is free software; you can redistribute it and/or
# modify it under the terms of the MIT License; see LICENSE file for more
Expand All @@ -10,6 +11,6 @@

from .ext import InvenioAdministration

__version__ = "2.9.0"
__version__ = "3.0.0"

__all__ = ["InvenioAdministration"]
24 changes: 12 additions & 12 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@ zip_safe = False
install_requires =
Flask-Menu>=0.5.0
Flask-Principal>=0.4.0
invenio-accounts>=5.0.0,<6.0.0
invenio-base>=1.3.0,<2.0.0
invenio-db[postgresql,mysql]>=1.0.9,<2.0.0
invenio-records-resources>=6.0.0,<7.0.0
invenio-search-ui>=3.0.0,<4.0.0
invenio-theme>=3.0.0,<4.0.0
invenio-accounts>=6.0.0,<7.0.0
invenio-base>=2.0.0,<3.0.0
invenio-db[postgresql,mysql]>=2.0.0,<3.0.0
invenio-records-resources>=7.0.0,<8.0.0
invenio-search-ui>=4.0.0,<5.0.0
invenio-theme>=4.0.0,<5.0.0

[options.extras_require]
tests =
pytest-black-ng>=0.4.0
pytest-invenio>=2.1.0,<3.0.0
pytest-invenio>=3.0.0,<4.0.0
sphinx>=4.5
invenio-access>=2.0.0,<3.0.0
invenio-app>=1.4.0,<2.0.0
invenio-access>=4.0.0,<5.0.0
invenio-app>=2.0.0,<3.0.0
elasticsearch7 =
invenio-search[elasticsearch7]>=2.1.0,<3.0.0
invenio-search[elasticsearch7]>=3.0.0,<4.0.0
opensearch1 =
invenio-search[opensearch1]>=2.1.0,<3.0.0
invenio-search[opensearch1]>=3.0.0,<4.0.0
opensearch2 =
invenio-search[opensearch2]>=2.1.0,<3.0.0
invenio-search[opensearch2]>=3.0.0,<4.0.0

[options.entry_points]
invenio_base.apps =
Expand Down
5 changes: 3 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
from invenio_access.models import ActionRoles, Role
from invenio_access.permissions import superuser_access
from invenio_accounts.testutils import login_user_via_session
from invenio_admin.permissions import action_admin_access
from invenio_app.factory import create_app as _create_app
from invenio_records_resources.resources import RecordResource
from invenio_records_resources.services import RecordService
from mock_module.administration.mock import MockView
from mock_module.config import ServiceConfig
from mock_module.resource import MockResource

from invenio_administration.permissions import administration_access_action


@pytest.fixture(scope="module")
def celery_config():
Expand Down Expand Up @@ -63,7 +64,7 @@ def admin_role_need(db):
role = Role(name="admin-access", id="admin-access")
db.session.add(role)

action_role = ActionRoles.create(action=action_admin_access, role=role)
action_role = ActionRoles.create(action=administration_access_action, role=role)
db.session.add(action_role)

db.session.commit()
Expand Down
Loading