Merge pull request #61 from ambitioninc/develop

Final Django4 changes

.github/workflows/tests.yml

@@ -22,6 +22,9 @@ jobs:
         - 'Django~=4.0.0'
         - 'Django~=4.1.0'
         - 'Django~=4.2.0'
+        psycopg:
+        - 'psycopg2==2.9.6'
+        - 'psycopg==3.1.10'
         experimental: [false]
         exclude:
         - python: '3.7'
@@ -30,6 +33,12 @@ jobs:
           django: 'Django~=4.1.0'
         - python: '3.7'
           django: 'Django~=4.2.0'
+        - psycopg: 'psycopg==3.1.10'
+          django: 'Django~=3.2.0'
+        - psycopg: 'psycopg==3.1.10'
+          django: 'Django~=4.0.0'
+        - psycopg: 'psycopg==3.1.10'
+          django: 'Django~=4.1.0'
 
     services:
       postgres:
@@ -57,6 +66,7 @@ jobs:
         pip install -r requirements/requirements.txt
         pip install -r requirements/requirements-testing.txt
         pip install "${{ matrix.django }}"
+        pip install "${{ matrix.psycopg }}"
         pip freeze
     - name: Run tests
       env:

.readthedocs.yaml

@@ -0,0 +1,14 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.8"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+    - requirements: requirements/docs.txt
+    - requirements: requirements/requirements.txt

localized_recurrence/__init__.py

@@ -1,4 +1,2 @@
 # flake8: noqa
 from .version import __version__
-
-default_app_config = 'localized_recurrence.apps.LocalizedRecurrenceConfig'

localized_recurrence/migrations/0001_initial.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 from django.db import models, migrations
 import ambition_utils.fields

localized_recurrence/migrations/0002_localizedrecurrence_offset2.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.11 on 2016-11-08 21:17
-from __future__ import unicode_literals
 
 import datetime
 from django.db import migrations, models

localized_recurrence/migrations/0003_offset_data_migration.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
 
 from datetime import timedelta
 from django.db import migrations

localized_recurrence/migrations/0004_auto_20161108_2151.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.11 on 2016-11-08 21:51
-from __future__ import unicode_literals
 
 import datetime
 from django.db import migrations, models

localized_recurrence/version.py

@@ -1 +1 @@
-__version__ = '4.1.1'
+__version__ = '4.1.3'

requirements/requirements.txt

@@ -3,3 +3,4 @@ ambition-utils>=3.1.1
 fleming>=0.6.0
 python-dateutil
 pytz
+django-timezone-field<6