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 #161

Merged
merged 3 commits into from
Dec 6, 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
26 changes: 2 additions & 24 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,5 @@ on:

jobs:
Publish:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel babel

- name: Build package
run: |
python setup.py sdist bdist_wheel

- name: Publish on PyPI
uses: pypa/[email protected]
with:
user: __token__
password: ${{ secrets.pypi_token }}
uses: inveniosoftware/workflows/.github/workflows/pypi-publish.yml@master
secrets: inherit
54 changes: 2 additions & 52 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 @@ -28,54 +28,4 @@ on:

jobs:
Tests:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
requirements-level: [pypi]
cache-service: [redis]
mq-service: [rabbitmq]
search-service: [opensearch2,elasticsearch7]

include:
- search-service: opensearch2
SEARCH_EXTRAS: "opensearch2"

- search-service: elasticsearch7
SEARCH_EXTRAS: "elasticsearch7"

env:
CACHE: ${{ matrix.cache-service }}
MQ: ${{ matrix.mq-service }}
SEARCH: ${{ matrix.search-service }}
EXTRAS: tests,${{ matrix.SEARCH_EXTRAS }}
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Generate dependencies
run: |
pip install wheel requirements-builder
requirements-builder -e "$EXTRAS" --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') }}

- name: Install dependencies
run: |
pip install -r .${{ matrix.requirements-level }}-${{ matrix.python-version }}-requirements.txt
pip install ".[$EXTRAS]"
pip freeze
docker --version

- name: Run tests
run: |
./run-tests.sh
uses: inveniosoftware/workflows/.github/workflows/tests-python.yml@master
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
..
This file is part of Invenio.
Copyright (C) 2016-2024 CERN.
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.

Changes
=======

Version 3.0.0 (release 2024-11-29)

- setup: bump major dependencies

Version 2.4.0 (released 2024-10-28)
- config: remove INDEXER_DEFAULT_INDEX default value
- cli: run command accepts a new parameter 'chunk_size'
Expand Down
3 changes: 2 additions & 1 deletion invenio_indexer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# This file is part of Invenio.
# Copyright (C) 2016-2024 CERN.
# 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 @@ -183,6 +184,6 @@
from .ext import InvenioIndexer
from .proxies import current_record_to_index

__version__ = "2.4.0"
__version__ = "3.0.0"

__all__ = ("__version__", "InvenioIndexer", "current_record_to_index")
18 changes: 9 additions & 9 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of Invenio.
# Copyright (C) 2016-2024 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 @@ -27,26 +27,26 @@ packages = find:
python_requires = >=3.7
zip_safe = False
install_requires =
invenio-db>=1.0.14,<2.0.0
invenio-pidstore>=1.2.0,<2.0.0
invenio-records>=2.0.0,<3.0.0
invenio-db>=2.0.0,<3.0.0
invenio-pidstore>=2.0.0,<3.0.0
invenio-records>=3.0.0,<4.0.0
pytz>=2016.4

[options.extras_require]
tests =
pytest-black>=0.3.0
pytest-black-ng>=0.4.0
attrs>=17.4.0
pytest-invenio>=2.1.0,<3.0.0
pytest-invenio>=3.0.0,<4.0.0
redis>=3.4.0
sphinx>=4.5
elasticsearch7 =
# needed: 7.5.0 integrates https://github.com/elastic/elasticsearch-py/pull/1062
elasticsearch>=7.5.0,<7.14.0
invenio-search[elasticsearch7]>=2.3.0,<3.0.0
invenio-search[elasticsearch7]>=3.0.0,<4.0.0
opensearch1 =
invenio-search[opensearch1]>=2.3.0,<3.0.0
invenio-search[opensearch1]>=3.0.0,<4.0.0
opensearch2 =
invenio-search[opensearch2]>=2.3.0,<3.0.0
invenio-search[opensearch2]>=3.0.0,<4.0.0
# Kept for backwards compatibility
docs =

Expand Down