From 52b928eec950ca9a9e15470ce53718737e68b72f Mon Sep 17 00:00:00 2001 From: Christoph Ladurner Date: Thu, 28 Nov 2024 09:09:46 +0100 Subject: [PATCH 1/3] setup: pin dependencies --- setup.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index f17f5c3..227ddd6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ # # This file is part of Invenio. # Copyright (C) 2015-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. @@ -27,16 +27,16 @@ packages = find: python_requires = >=3.8 zip_safe = False install_requires = - invenio-celery>=1.2.4 - invenio-db>=1.0.12 + invenio-celery>=1.2.4,<2.0.0 + invenio-db>=1.0.12,<2.0.0 [options.extras_require] tests = - pytest-black>=0.3.0,<0.3.10 + pytest-black-ng>=0.4.0 flask-login>=0.6.1 httpretty>=0.8.14 mock>=1.3.0 - pytest-invenio>=1.4.2 + pytest-invenio>=1.4.2,<3.0.0 iniconfig>=1.1.1 sphinx>=4.5 # Sentry-SDK v2.x has breaking changes (see https://github.com/inveniosoftware/invenio-logging/issues/73) From 7d00e1fba5b26a5a5b83d1c285dd75b213e9f73c Mon Sep 17 00:00:00 2001 From: Christoph Ladurner Date: Thu, 28 Nov 2024 09:11:01 +0100 Subject: [PATCH 2/3] setup: change to reusable workflows --- .github/workflows/pypi-publish.yml | 28 ++----------------- .github/workflows/tests.yml | 43 ++++-------------------------- 2 files changed, 7 insertions(+), 64 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 75c0475..d37d460 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -7,29 +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.7 - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install setuptools wheel babel - - - name: Build package - # Remove `compile_catalog` if the package has no translations. - run: | - python setup.py sdist bdist_wheel - - - name: Publish on PyPI - uses: pypa/gh-action-pypi-publish@v1.3.1 - with: - user: __token__ - # The token is provided by the inveniosoftware organization - password: ${{ secrets.pypi_token }} + uses: inveniosoftware/workflows/.github/workflows/pypi-publish.yml@master + secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index acc3b74..8ead05e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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. @@ -26,40 +26,7 @@ on: jobs: Tests: - runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: [3.8, 3.9] - requirements-level: [pypi] - - env: - EXTRAS: tests - 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 - - - name: Run tests - run: | - ./run-tests.sh + uses: inveniosoftware/workflows/.github/workflows/tests-python.yml@master + with: + db-service: '[""]' + search-service: '[""]' From 633dd8dff96ee0720a76a2bfaa2e3936011ecbb7 Mon Sep 17 00:00:00 2001 From: Christoph Ladurner Date: Thu, 28 Nov 2024 09:12:06 +0100 Subject: [PATCH 3/3] release: v2.1.2 --- CHANGES.rst | 5 +++++ invenio_logging/__init__.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1de6446..a515ae8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,7 @@ .. This file is part of Invenio. Copyright (C) 2015-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. @@ -8,6 +9,10 @@ Changes ======= +Version 2.1.2 (released 2024-11-28) + +- setup: pin dependencies + Version 2.1.1 (released 2024-04-30) - installation: upper pin Sentry-SDK diff --git a/invenio_logging/__init__.py b/invenio_logging/__init__.py index 4404e6f..a621bcc 100644 --- a/invenio_logging/__init__.py +++ b/invenio_logging/__init__.py @@ -2,6 +2,7 @@ # # This file is part of Invenio. # Copyright (C) 2015-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. @@ -87,6 +88,6 @@ from __future__ import absolute_import, print_function -__version__ = "2.1.1" +__version__ = "2.1.2" __all__ = ("__version__",)