From 8c63ec94e9ef11d495f0eac11c0bfc72c344fa3a Mon Sep 17 00:00:00 2001 From: Christopher Banck Date: Mon, 3 Feb 2025 11:32:27 +0100 Subject: [PATCH] update django and python version --- .github/workflows/run-tests.yml | 38 ++++++--------------------------- requirements.txt | 8 +++---- setup.cfg | 2 +- setup.py | 9 ++++---- 4 files changed, 17 insertions(+), 40 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index cc22b6f0..cc1ac62d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,39 +11,15 @@ on: # https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django jobs: build: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: matrix: - os: [ macos-latest, ubuntu-latest ] - python-version: [ 3.9, "3.10" ] - django-version: [ 3.2, 4.0, 4.1, 4.2 ] + python-version: [ "3.10", "3.11", "3.12" , "3.13"] + django-version: [ "5.0", "5.1" ] include: - - os: macos-latest - python-version: "3.8" - django-version: "3.2" - - os: ubuntu-latest - python-version: "3.8" - django-version: "3.2" - - os: macos-latest - python-version: "3.8" - django-version: "4.0" - - os: ubuntu-latest - python-version: "3.8" - django-version: "4.0" - - os: macos-latest - python-version: "3.10" - django-version: "5.0" - - os: ubuntu-latest - python-version: "3.10" - django-version: "5.0" - - os: macos-latest - python-version: "3.10" - django-version: "5.0.3" - - os: ubuntu-latest - python-version: "3.10" - django-version: "5.0.3" - + - python-version: "3.9" + django-version: "4.2" steps: - name: Checkout code uses: actions/checkout@v4 @@ -55,8 +31,8 @@ jobs: - name: Install dependencies run: | - pip install -q Django==${{ matrix.django-version }} - python -m pip install --upgrade pip + pip install -U pip setuptools + pip install -q django==${{ matrix.django-version }} python setup.py install - name: Test with pytest diff --git a/requirements.txt b/requirements.txt index 8182315a..35be6968 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -urllib3<2 ; python_version < '3.7' # urllib3 2.0 dropped support for Python 3.6 -zipp<3.7 ; python_version < '3.7' # zipp 3.7.0 dropped support for Python 3.6 -Django>=3.2 -Markdown<3.6 +urllib3 +zipp +Django +Markdown requests bleach tzdata diff --git a/setup.cfg b/setup.cfg index 95c03d84..d9b7b8e7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,7 +10,7 @@ max-line-length = 120 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules [mypy] -python_version = 3.7 +python_version = 3.9 check_untyped_defs = True ignore_missing_imports = True warn_unused_ignores = True diff --git a/setup.py b/setup.py index dbbafac7..99386eb4 100644 --- a/setup.py +++ b/setup.py @@ -27,17 +27,18 @@ def get_requirements(): "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 3.2", - "Framework :: Django :: 4.0", - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", + "Framework :: Django :: 5.1", "Intended Audience :: Developers", "Operating System :: OS Independent", "Programming Language :: JavaScript", "Programming Language :: Python", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Software Development :: Libraries :: Python Modules", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", ],