From 8ab106706c2320f44f1a6ef5718ecdcb61455a04 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 15 Apr 2023 22:03:42 +0200 Subject: [PATCH] Release v0.9.0 Per README.md, this project was GPLv2+ up until 0.3.0. Apparently we forgot to change the license in the Fedora specfile those days. Doing now upstream to be in sync (and using the SPDX format directly). --- .packit.yml | 7 ++++++- docs/index.rst | 9 +++++++++ fedora/python-flask-whooshee.spec | 2 +- flask_whooshee.py | 2 +- pyproject.toml | 2 ++ requirements.txt | 1 + setup.py | 4 +++- 7 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 pyproject.toml diff --git a/.packit.yml b/.packit.yml index 71dbeb1..6baa860 100644 --- a/.packit.yml +++ b/.packit.yml @@ -1,11 +1,16 @@ --- specfile_path: fedora/python-flask-whooshee.spec +srpm_build_deps: + - python3-whoosh + - python3-flask-sqlalchemy + - python3-setuptools + actions: create-archive: - python3 setup.py sdist --dist-dir ./fedora/ - bash -c "ls -1t ./fedora/*.tar.gz | head -n 1" - get-current-version: "sed -n \"s|.*version='\\(.*\\)'.*|\\1|p\" setup.py" + get-current-version: "sed -n \"s|__version__ = '\\(.*\\)'.*|\\1|p\" flask_whooshee.py" jobs: - &copr diff --git a/docs/index.rst b/docs/index.rst index 1565060..9bef676 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -319,6 +319,15 @@ API Changelog --------- +0.9.0 +##### + +* Development switched from `master` to `main` branch. +* Fixed compatiblity with flask-sqlalchemy v3+ +* Fixed compatibility with SQLAlchemy 2+ +* 285ae36576abc2ca26b74c490fbb3b954062f5c1 +* Switched to SPDX license ID format BSD-3-Clause + 0.8.2 ##### diff --git a/fedora/python-flask-whooshee.spec b/fedora/python-flask-whooshee.spec index a11d34a..a3b1a32 100644 --- a/fedora/python-flask-whooshee.spec +++ b/fedora/python-flask-whooshee.spec @@ -5,7 +5,7 @@ Version: 0 Release: 1%{?dist} Summary: Whoosh integration -License: GPLv2+ +License: BSD-3-Clause URL: https://github.com/bkabrda/flask-whooshee Source0: https://pypi.python.org/packages/source/f/%{mod_name}/%{mod_name}-%{version}.tar.gz # https://github.com/bkabrda/flask-whooshee/pull/19 diff --git a/flask_whooshee.py b/flask_whooshee.py index 4184489..9ec6e18 100644 --- a/flask_whooshee.py +++ b/flask_whooshee.py @@ -32,7 +32,7 @@ DELETE_KWD = 'delete' -__version__ = '0.7.0' +__version__ = '0.9.0' def _get_app(obj): diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..afd34f0 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = ["flask-sqlalchemy", "setuptools", "whoosh"] diff --git a/requirements.txt b/requirements.txt index cca1ca8..36f6da1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ sphinx pytest flexmock +flask-sqlalchemy diff --git a/setup.py b/setup.py index cfc9ef3..2e58932 100755 --- a/setup.py +++ b/setup.py @@ -55,10 +55,12 @@ class Entry(db.Model): * `Issues `_ """ from setuptools import setup +from flask_whooshee import __version__ + setup( name='flask-whooshee', - version='0.8.2', + version=__version__, description='Flask-SQLAlchemy - Whoosh Integration', long_description=__doc__, keywords='flask, sqlalchemy, whoosh',