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

feature/flask v3 #461

Merged
merged 8 commits into from
Feb 13, 2025
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
24 changes: 4 additions & 20 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +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: 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
82 changes: 0 additions & 82 deletions .github/workflows/tests-feature.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
..
Copyright (C) 2020-2024 CERN.
Copyright (C) 2024 Graz University of Technology.

Invenio-Vocabularies 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,19 @@
Changes
=======

Version v7.0.0 (released 2025-02-13)

- Promote to stable release
- jobs: apply code upgrades

Version v7.0.0.dev2 (released 2025-01-23)

Version v7.0.0.dev1 (released 2024-12-12)

- comp: make compatible to flask-sqlalchemy>=3.1
- setup: change to reusable workflows
- setup: bump major dependencies

Version v6.11.0 (released 2024-12-13)

- names: fix acronym in marshamllow schema
Expand Down
3 changes: 2 additions & 1 deletion invenio_vocabularies/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2020-2024 CERN.
# Copyright (C) 2024 Graz University of Technology.
#
# Invenio-Vocabularies 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 InvenioVocabularies

__version__ = "6.11.0"
__version__ = "7.0.0"

__all__ = ("__version__", "InvenioVocabularies")
20 changes: 10 additions & 10 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ packages = find:
python_requires = >=3.7
zip_safe = False
install_requires =
invenio-i18n>=2.0.0,<3.0.0
invenio-records-resources>=6.0.0,<7.0.0
invenio-administration>=2.0.0,<3.0.0
invenio-jobs>=2.0.0,<3.0.0
invenio-i18n>=3.0.0,<4.0.0
invenio-records-resources>=7.0.0,<8.0.0
invenio-administration>=3.0.0,<4.0.0
invenio-jobs>=3.0.0,<4.0.0
lxml>=4.5.0
# Upper pinning pycountry due to commonmeta-py
pycountry>=22.3.5,<23.0.0
Expand All @@ -49,17 +49,17 @@ sparql =
SPARQLWrapper>=2.0.0
tests =
pytest-black-ng>=0.4.0
invenio-app>=1.4.0,<2.0.0
invenio-db[postgresql,mysql]>=1.0.14,<2.0.0
invenio-app>=2.0.0,<3.0.0
invenio-db[postgresql,mysql]>=2.0.0,<3.0.0
pytest_httpserver>=1.0.10
pytest-invenio>=2.1.0,<3.0.0
pytest-invenio>=3.0.0,<4.0.0
Sphinx>=4.5
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
# Kept for backwards compatibility:
mysql =
postgresql =
Expand Down
3 changes: 2 additions & 1 deletion tests/test_alembic.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# This file is part of Invenio.
# Copyright (C) 2021 TU Wien.
# Copyright (C) 2021 Northwestern University.
# Copyright (C) 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 Down Expand Up @@ -46,7 +47,7 @@ def test_alembic(app, database):
raise pytest.skip("Upgrades are not supported on SQLite.")

# Check that this package's SQLAlchemy models have been properly registered
tables = [x.name for x in db.get_tables_for_bind()]
tables = [x for x in db.metadata.tables]
assert "vocabularies_metadata" in tables
assert "vocabularies_types" in tables
assert "vocabularies_schemes" in tables
Expand Down
Loading