Skip to content

Commit

Permalink
remove 3.8, add 3.13 (#749)
Browse files Browse the repository at this point in the history
[#188680941]
  • Loading branch information
uraniumanchor authored Jan 4, 2025
1 parent cda7179 commit ba7a091
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 31 deletions.
15 changes: 6 additions & 9 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,26 @@ jobs:
strategy:
matrix:
Oldest:
PYTHON_VERSION: '3.8'
PYTHON_VERSION: '3.9'
DJANGO_VERSION: '4.2'
Django42:
PYTHON_VERSION: '3.12'
DJANGO_VERSION: '4.2'
Django50:
PYTHON_VERSION: '3.12'
PYTHON_VERSION: '3.13'
DJANGO_VERSION: '5.0'
Python38:
PYTHON_VERSION: '3.8'
DJANGO_VERSION: '4.2'
Python39:
PYTHON_VERSION: '3.9'
DJANGO_VERSION: '4.2'
Python3A:
PYTHON_VERSION: '3.10'
DJANGO_VERSION: '5.1'
Python3B:
PYTHON_VERSION: '3.11'
DJANGO_VERSION: '5.1'
Latest:
Python3C:
PYTHON_VERSION: '3.12'
DJANGO_VERSION: '5.1'
Latest:
PYTHON_VERSION: '3.13'
DJANGO_VERSION: '5.1'

steps:
- task: UsePythonVersion@0
Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def get_package_name(name):

setup(
name=get_package_name('django-donation-tracker'),
version='3.2',
version='3.3',
author='Games Done Quick',
author_email='[email protected]',
packages=find_packages(include=['tracker', 'tracker.*']),
Expand All @@ -48,7 +48,6 @@ def get_package_name(name):
'package': PackageCommand,
},
install_requires=[
'backports.zoneinfo;python_version<"3.9"',
'celery~=5.0',
'channels>=4.0',
'Django>=4.2,<5.2',
Expand All @@ -64,7 +63,7 @@ def get_package_name(name):
extras_require={
'development': ['daphne~=4.0'],
},
python_requires='>=3.8, <3.13',
python_requires='>=3.9, <3.14',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
Expand All @@ -74,11 +73,11 @@ def get_package_name(name):
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'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 :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules',
],
Expand Down
10 changes: 4 additions & 6 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# base
celery==5.4.0
channels==4.2.0
setuptools
wheel
# django explicitly not listed here because azure installs a particular series immediately after
django-ical==1.9.2
django-paypal==1.1.2
django-mptt==0.14.0 ; python_version<"3.9"
django-mptt==0.16.0 ; python_version>="3.9"
django-mptt==0.16.0
django-post-office==3.6.0
django-timezone-field==7.0
djangorestframework==3.15.2
pre-commit==3.5.0 ; python_version<"3.9"
pre-commit==4.0.1 ; python_version>="3.9"
python-dateutil==2.8.2
backports.zoneinfo==0.2.1 ; python_version<"3.9"
pre-commit==4.0.1
python-dateutil==2.8.2 ; python_version<"3.11"
webpack-manifest==2.1.1
# only for testing
Expand Down
2 changes: 1 addition & 1 deletion tests/test_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
import io
import json
import random
import zoneinfo

import post_office.models
from django.contrib.auth.models import Group, Permission, User
from django.test import TestCase, TransactionTestCase, override_settings
from django.urls import reverse

from tracker import models, settings
from tracker.compat import zoneinfo
from tracker.util import make_rand, utcnow

from . import randgen
Expand Down
3 changes: 2 additions & 1 deletion tests/test_speedrun.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import datetime
import itertools
import random
import zoneinfo
from typing import Iterable, List, Optional, Union
from unittest import skipIf

Expand All @@ -12,7 +13,7 @@

import tracker.models as models
from tracker import settings
from tracker.compat import pairwise, zoneinfo
from tracker.compat import pairwise

from . import randgen
from .util import today_noon
Expand Down
2 changes: 1 addition & 1 deletion tests/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import sys
import time
import unittest
import zoneinfo
from decimal import Decimal

from django.contrib.admin.models import LogEntry
Expand All @@ -36,7 +37,6 @@

from tracker import models, settings, util
from tracker.api.pagination import TrackerPagination
from tracker.compat import zoneinfo

_empty = object()

Expand Down
8 changes: 0 additions & 8 deletions tracker/compat.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
try:
import zoneinfo
except ImportError:
# TODO: remove when 3.9 is oldest supported version

# noinspection PyUnresolvedReferences
from backports import zoneinfo # noqa: F401

try:
from itertools import pairwise
except ImportError:
Expand Down
2 changes: 1 addition & 1 deletion tracker/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def try_parse_int(s, base=10, val=None):


def anywhere_on_earth_tz():
from .compat import zoneinfo
import zoneinfo

"""This is a trick used by academic conference submission deadlines
to use the last possible timezone to define the end of a particular date"""
Expand Down

0 comments on commit ba7a091

Please sign in to comment.