diff --git a/Makefile b/Makefile index ce906b8..554012d 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ pylint: if [ ! -d "$(KIWI_INCLUDE_PATH)/kiwi_lint" ]; then \ git clone --depth 1 https://github.com/kiwitcms/Kiwi.git $(KIWI_INCLUDE_PATH); \ pip install -U -r $(KIWI_INCLUDE_PATH)/requirements/base.txt; \ - pip install -U -r requirements.txt; --index-url https://$(PKG_TOKEN)@pkg.kiwitcms.eu/pypi/ --extra-index-url https://pypi.org/simple/; \ + pip install -U -r requirements.txt --index-url https://$(PKG_TOKEN)@pkg.kiwitcms.eu/pypi/ --extra-index-url https://pypi.org/simple/; \ rm -rf $(PATH_TO_SITE_PACKAGES)/test_project; \ fi @@ -46,7 +46,7 @@ test_for_missing_migrations: if [ ! -d "$(KIWI_INCLUDE_PATH)/kiwi_lint" ]; then \ git clone --depth 1 https://github.com/kiwitcms/Kiwi.git $(KIWI_INCLUDE_PATH); \ pip install -U -r $(KIWI_INCLUDE_PATH)/requirements/base.txt; \ - pip install -U -r requirements.txt; --index-url https://$(PKG_TOKEN)@pkg.kiwitcms.eu/pypi/ --extra-index-url https://pypi.org/simple/; \ + pip install -U -r requirements.txt --index-url https://$(PKG_TOKEN)@pkg.kiwitcms.eu/pypi/ --extra-index-url https://pypi.org/simple/; \ rm -rf $(PATH_TO_SITE_PACKAGES)/test_project; \ fi diff --git a/README.rst b/README.rst index ffeda61..90c6571 100644 --- a/README.rst +++ b/README.rst @@ -107,6 +107,14 @@ Then configure how the application interacts with GitHub: Changelog --------- +v2.3.0 (17 Jun 2026) +~~~~~~~~~~~~~~~~~~~~ + +- Build and test with Django 6 +- Require Python 3.12 or newer +- Add django.contrib.postgres to INSTALLED_APPS + + v2.2.2 (04 Jun 2026) ~~~~~~~~~~~~~~~~~~~~ diff --git a/requirements.txt b/requirements.txt index 9c569ba..d7170b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ cryptography>=46.0.5 # not directly required, pinned by Snyk to avoid a vulnerab pyjwt>=2.4.0 # not directly required, pinned by Snyk to avoid a vulnerability requests>=2.32.4 # not directly required, pinned by Snyk to avoid a vulnerability sqlparse>=0.5.4 # not directly required, pinned by Snyk to avoid a vulnerability -django>=5.0.14 # not directly required, pinned by Snyk to avoid a vulnerability +django>=6.0 # not directly required, pinned by Snyk to avoid a vulnerability urllib3>=2.6.3 # not directly required, pinned by Snyk to avoid a vulnerability diff --git a/setup.py b/setup.py index 024409c..ee1fc08 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def get_install_requires(path): setup( name='kiwitcms-github-app', - version='2.2.2', + version='2.3.0', description='GitHub App integration for Kiwi TCMS', long_description=get_long_description(), author='Kiwi TCMS', @@ -34,6 +34,7 @@ def get_install_requires(path): url='https://github.com/kiwitcms/github-app/', license='AGPLv3+', install_requires=get_install_requires('requirements.txt'), + python_requires='>=3.12', packages=find_packages(exclude=['test_project*', '*.tests']), zip_safe=False, include_package_data=True, @@ -47,6 +48,7 @@ def get_install_requires(path): 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.12', + 'Framework :: Django :: 6.0', ], entry_points={"kiwitcms.plugins": ["kiwitcms_github_app = tcms_github_app"]}, ) diff --git a/tcms_settings_dir/github_app.py b/tcms_settings_dir/github_app.py index 797cd2f..d59aa9c 100644 --- a/tcms_settings_dir/github_app.py +++ b/tcms_settings_dir/github_app.py @@ -10,3 +10,6 @@ if 'tcms_github_app.issues.Integration' not in EXTERNAL_BUG_TRACKERS: # noqa: F821 EXTERNAL_BUG_TRACKERS.append('tcms_github_app.issues.Integration') # noqa: F821 + +if 'django.contrib.postgres' not in INSTALLED_APPS: # noqa: F821 + INSTALLED_APPS.append('django.contrib.postgres') # noqa: F821