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

global: remove invenio-admin #325

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
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
33 changes: 8 additions & 25 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of Invenio.
# Copyright (C) 2020 CERN.
# Copyright (C) 2022 Graz University of Technology.
# Copyright (C) 2022-2024 Graz University of Technology.
#
# Invenio is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand All @@ -29,51 +29,34 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ["3.9", "3.12"]
requirements-level: [pypi]
db-service: [postgresql13, mysql8]
db-service: [postgresql14, mysql8]

include:
- db-service: postgresql13
- db-service: postgresql14
DB: postgresql
POSTGRESQL_VERSION: POSTGRESQL_13_LATEST
SQLALCHEMY_DATABASE_URI: "postgresql+psycopg2://invenio:invenio@localhost:5432/invenio"

- db-service: mysql8
DB: mysql
MYSQL_VERSION: MYSQL_8_LATEST
SQLALCHEMY_DATABASE_URI: "mysql+pymysql://invenio:invenio@localhost:3306/invenio"

env:
SQLALCHEMY_DATABASE_URI: ${{matrix.SQLALCHEMY_DATABASE_URI}}
POSTGRESQL_VERSION: ${{matrix.POSTGRESQL_VERSION}}
MYSQL_VERSION: ${{matrix.MYSQL_VERSION}}
DB: ${{ matrix.DB }}
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 .[$EXTRAS]
pip freeze
docker --version
Expand Down
108 changes: 0 additions & 108 deletions invenio_oauthclient/admin.py

This file was deleted.

5 changes: 0 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ install_requires =

[options.extras_require]
tests =
flask_admin>=1.6.0
pytest-black-ng>=0.4.0
httpretty>=0.8.14
invenio-userprofiles>=3.0.0
Expand All @@ -55,7 +54,6 @@ tests =
invenio-db[mysql,postgresql,versioning]>=1.0.9,<2.0.0

# Kept for backwards compatibility
admin =
docs =
github =
mysql =
Expand All @@ -64,9 +62,6 @@ postgresql =
sqlite =

[options.entry_points]
invenio_admin.views =
invenio_oauth_remote_account = invenio_oauthclient.admin:remote_account_adminview
invenio_oauth_remote_token = invenio_oauthclient.admin:remote_token_adminview
invenio_base.apps =
invenio_oauthclient = invenio_oauthclient:InvenioOAuthClient
invenio_base.api_apps =
Expand Down
53 changes: 0 additions & 53 deletions tests/test_admin.py

This file was deleted.