From db6f11c7c0bf0d5db74fb664fdf20d8c3f68bf0c Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 15 Mar 2023 14:13:30 +0100 Subject: [PATCH 1/7] misc: require django 3.2 (#75442) --- debian/control | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index fe31420a..786993c6 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Standards-Version: 3.9.6 Package: python3-chrono Architecture: all -Depends: python3-django (>= 2:2.2), +Depends: python3-django (>= 2:3.2), python3-gadjo, python3-publik-django-templatetags, python3-requests, diff --git a/setup.py b/setup.py index 8dc2695a..bc9c49f5 100644 --- a/setup.py +++ b/setup.py @@ -159,7 +159,7 @@ setup( 'Programming Language :: Python :: 3', ], install_requires=[ - 'django>=2.2, <3.3', + 'django>=3.2, <3.3', 'gadjo', 'djangorestframework>=3.4,<3.14', 'django-filter', -- 2.39.2 From de227cfe26d946dd90f57fcb24d55bc12bb3e65d Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 15 Mar 2023 14:13:36 +0100 Subject: [PATCH 2/7] misc: change django-upgrade target version to 3.2 (#75442) --- .pre-commit-config.yaml | 4 ++-- README | 2 +- chrono/agendas/models.py | 23 +++++------------------ chrono/settings.py | 2 +- chrono/urls.py | 8 ++++---- tests/settings.py | 2 +- 6 files changed, 14 insertions(+), 27 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7194d72e..8c5510eb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,10 +17,10 @@ repos: - id: pyupgrade args: ['--keep-percent-format', '--py37-plus'] - repo: https://github.com/adamchainz/django-upgrade - rev: 1.10.0 + rev: 1.13.0 hooks: - id: django-upgrade - args: ['--target-version', '2.2'] + args: ['--target-version', '3.2'] - repo: https://github.com/rtts/djhtml rev: 'v1.5.2' hooks: diff --git a/README b/README index f867fa5b..398ee3b1 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ pyupgrade is used to automatically upgrade syntax, using those parameters: django-upgrade is used to automatically upgrade Django syntax, using those parameters: - django-upgrade --target-version 2.2 + django-upgrade --target-version 3.2 djhtml is used to automatically indent html files, using those parameters: diff --git a/chrono/agendas/models.py b/chrono/agendas/models.py index 9b903f69..12f397b5 100644 --- a/chrono/agendas/models.py +++ b/chrono/agendas/models.py @@ -25,7 +25,6 @@ import sys import uuid from contextlib import contextmanager -import django import requests import vobject from dateutil.relativedelta import SU, relativedelta @@ -51,7 +50,7 @@ from django.db.models import ( Subquery, Value, ) -from django.db.models.functions import Cast, Coalesce, Concat, ExtractWeek, ExtractWeekDay +from django.db.models.functions import Cast, Coalesce, Concat, ExtractWeek, ExtractWeekDay, JSONObject from django.template import Context, Template, TemplateSyntaxError, VariableDoesNotExist, engines from django.urls import reverse from django.utils import functional @@ -1697,22 +1696,10 @@ class Event(models.Model): if agendas: overlapping_events = overlapping_events.filter(agenda__in=agendas) - if django.VERSION >= (3, 2): - from django.db.models.functions import JSONObject - - json_object = JSONObject( - slug=F('computed_slug'), - days=F('recurrence_days'), - ) - else: - json_object = Func( - Value('slug'), - 'computed_slug', - Value('days'), - 'recurrence_days', - function='jsonb_build_object', - output_field=models.JSONField(), - ) + json_object = JSONObject( + slug=F('computed_slug'), + days=F('recurrence_days'), + ) return qs.annotate( overlaps=ArraySubquery( diff --git a/chrono/settings.py b/chrono/settings.py index df0e90b9..6e909fd2 100644 --- a/chrono/settings.py +++ b/chrono/settings.py @@ -83,7 +83,7 @@ WSGI_APPLICATION = 'chrono.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', } } diff --git a/chrono/urls.py b/chrono/urls.py index 6d93e605..68733783 100644 --- a/chrono/urls.py +++ b/chrono/urls.py @@ -28,15 +28,15 @@ from .views import LoginView, LogoutView, homepage urlpatterns = [ path('', homepage, name='home'), re_path(r'^manage/', decorated_includes(login_required, include(chrono_manager_urls))), - re_path(r'^api/', include(chrono_api_urls)), + path('api/', include(chrono_api_urls)), path('logout/', LogoutView.as_view(), name='auth_logout'), path('login/', LoginView.as_view(), name='auth_login'), ] if 'mellon' in settings.INSTALLED_APPS: urlpatterns.append( - re_path( - r'^accounts/mellon/', + path( + 'accounts/mellon/', include('mellon.urls'), kwargs={ 'template_base': 'chrono/manager_base.html', @@ -48,7 +48,7 @@ if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS: import debug_toolbar # pylint: disable=import-error urlpatterns = [ - re_path(r'^__debug__/', include(debug_toolbar.urls)), + path('__debug__/', include(debug_toolbar.urls)), ] + urlpatterns # static and media files diff --git a/tests/settings.py b/tests/settings.py index 18aa3d4f..045919fd 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -10,7 +10,7 @@ REST_FRAMEWORK = { DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'TEST': { 'NAME': 'chrono-test-%s' % os.environ.get("BRANCH_NAME", "").replace('/', '-')[:45], }, -- 2.39.2 From 6392be5eed9287b4bfd1d982584c82d764970dc6 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 15 Mar 2023 14:13:41 +0100 Subject: [PATCH 3/7] misc: change pyupgrade target version to 3.9 (#75442) --- .pre-commit-config.yaml | 4 ++-- chrono/utils/timezone.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8c5510eb..a4764a55 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,10 +12,10 @@ repos: - id: isort args: ['--profile', 'black', '--line-length', '110'] - repo: https://github.com/asottile/pyupgrade - rev: v3.1.0 + rev: v3.3.1 hooks: - id: pyupgrade - args: ['--keep-percent-format', '--py37-plus'] + args: ['--keep-percent-format', '--py39-plus'] - repo: https://github.com/adamchainz/django-upgrade rev: 1.13.0 hooks: diff --git a/chrono/utils/timezone.py b/chrono/utils/timezone.py index 74dfa9d2..41f8908c 100644 --- a/chrono/utils/timezone.py +++ b/chrono/utils/timezone.py @@ -24,7 +24,7 @@ from django.conf import settings utc = zoneinfo.ZoneInfo('UTC') -@functools.lru_cache() +@functools.lru_cache def get_default_timezone(): """ Return the default time zone as a tzinfo instance. -- 2.39.2 From b38f5f901e1bef556bd95f45bcc041b092b1a617 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 15 Mar 2023 14:13:53 +0100 Subject: [PATCH 4/7] misc: bump black version (#75442) --- .pre-commit-config.yaml | 4 ++-- chrono/agendas/migrations/0001_initial.py | 1 - chrono/agendas/migrations/0002_event.py | 1 - chrono/agendas/migrations/0003_booking.py | 1 - .../agendas/migrations/0004_booking_cancellation_datetime.py | 1 - chrono/agendas/migrations/0005_event_label.py | 1 - chrono/agendas/migrations/0006_auto_20160707_1357.py | 1 - chrono/agendas/migrations/0007_auto_20160722_1135.py | 1 - chrono/agendas/migrations/0008_auto_20160910_1319.py | 1 - chrono/agendas/migrations/0009_auto_20160911_1640.py | 1 - chrono/agendas/migrations/0010_auto_20160918_1250.py | 1 - chrono/agendas/migrations/0011_meetingtype_slug.py | 1 - .../migrations/0012_manual_set_slugs_on_meeting_types.py | 1 - chrono/agendas/migrations/0013_auto_20161028_1603.py | 1 - chrono/agendas/migrations/0014_booking_primary_booking.py | 1 - chrono/agendas/migrations/0015_auto_20170628_1137.py | 1 - chrono/agendas/migrations/0016_desk.py | 1 - chrono/agendas/migrations/0017_timeperiod_desk.py | 1 - chrono/agendas/migrations/0018_event_desk.py | 1 - chrono/agendas/migrations/0019_timeperiodexception.py | 1 - chrono/agendas/migrations/0020_auto_20171102_1021.py | 1 - chrono/agendas/migrations/0021_auto_20171126_1330.py | 1 - chrono/agendas/migrations/0022_auto_20171202_1828.py | 1 - chrono/agendas/migrations/0023_auto_20171202_1835.py | 1 - chrono/agendas/migrations/0024_auto_20180426_1127.py | 1 - chrono/agendas/migrations/0025_auto_20181206_1252.py | 1 - chrono/agendas/migrations/0026_booking_user_display_label.py | 1 - chrono/agendas/migrations/0027_event_description.py | 1 - chrono/agendas/migrations/0028_event_slug.py | 1 - chrono/agendas/migrations/0029_auto_20191106_1320.py | 1 - chrono/agendas/migrations/0030_auto_20191107_1200.py | 1 - chrono/agendas/migrations/0031_auto_20191107_1225.py | 1 - chrono/agendas/migrations/0032_auto_20191127_0919.py | 1 - chrono/agendas/migrations/0033_timeperiodexceptionsource.py | 1 - chrono/agendas/migrations/0034_initial_source.py | 1 - .../0035_remove_desk_timeperiod_exceptions_remote_url.py | 1 - chrono/agendas/migrations/0036_auto_20191223_1758.py | 1 - .../migrations/0037_timeperiodexceptionsource_ics_file.py | 1 - chrono/agendas/migrations/0038_start_virtual_agendas.py | 1 - chrono/agendas/migrations/0039_booking_delays.py | 1 - chrono/agendas/migrations/0040_timeperiod_agenda.py | 1 - chrono/agendas/migrations/0041_clean_event_slug_unicity.py | 1 - chrono/agendas/migrations/0042_auto_20200503_1231.py | 1 - chrono/agendas/migrations/0043_booking_user_external_id.py | 1 - chrono/agendas/migrations/0044_event_publication_date.py | 1 - chrono/agendas/migrations/0045_agenda_resources.py | 1 - chrono/agendas/migrations/0046_event_duration.py | 1 - chrono/agendas/migrations/0047_auto_20200617_1521.py | 1 - chrono/agendas/migrations/0048_meeting_type_deleted_flag.py | 1 - chrono/agendas/migrations/0049_event_slug.py | 1 - chrono/agendas/migrations/0050_event_slug.py | 1 - chrono/agendas/migrations/0051_default_view.py | 1 - chrono/agendas/migrations/0052_event_date_range_constraint.py | 1 - chrono/agendas/migrations/0053_event_date_range_constraint.py | 1 - chrono/agendas/migrations/0054_agenda_categories.py | 1 - chrono/agendas/migrations/0055_booking_cancel_callback_url.py | 1 - chrono/agendas/migrations/0056_auto_20200811_1611.py | 1 - chrono/agendas/migrations/0057_auto_20200831_1634.py | 1 - .../agendas/migrations/0058_timeperiodexception_external.py | 1 - chrono/agendas/migrations/0059_event_almost_full.py | 1 - chrono/agendas/migrations/0060_auto_20200903_1041.py | 1 - chrono/agendas/migrations/0061_auto_20200909_1752.py | 1 - chrono/agendas/migrations/0062_auto_20200915_1401.py | 1 - chrono/agendas/migrations/0063_auto_20200928_1445.py | 1 - chrono/agendas/migrations/0064_booking_form_url.py | 1 - chrono/agendas/migrations/0065_unavailability_calendar.py | 1 - .../0066_timeperiodexceptionsource_unique_settings_slug.py | 1 - chrono/agendas/migrations/0067_auto_20201021_1746.py | 1 - .../migrations/0068_remove_timeperiodexception_external.py | 1 - chrono/agendas/migrations/0069_translate_holidays.py | 1 - chrono/agendas/migrations/0070_auto_20201202_1834.py | 1 - chrono/agendas/migrations/0071_booking_attendance.py | 1 - chrono/agendas/migrations/0072_booking_absence_reason.py | 1 - chrono/agendas/migrations/0074_simple_desks.py | 1 - chrono/agendas/migrations/0075_auto_20210216_1553.py | 1 - chrono/agendas/migrations/0076_event_recurrence_end_date.py | 1 - chrono/agendas/migrations/0077_meetings_default_view.py | 1 - chrono/agendas/migrations/0078_absence_reasons.py | 1 - chrono/agendas/migrations/0079_auto_20210428_1533.py | 1 - chrono/agendas/migrations/0080_create_exceptions_desks.py | 1 - chrono/agendas/migrations/0081_recurrenceexceptionsreport.py | 1 - chrono/agendas/migrations/0082_text_to_jsonb.py | 1 - chrono/agendas/migrations/0083_reason_slug.py | 1 - chrono/agendas/migrations/0084_reason_slug.py | 1 - chrono/agendas/migrations/0085_reason_slug.py | 1 - chrono/agendas/migrations/0086_booking_user_block_template.py | 1 - chrono/agendas/migrations/0087_booking_user_name.py | 1 - chrono/agendas/migrations/0088_booking_check_filters.py | 1 - .../agendas/migrations/0089_agenda_event_display_template.py | 1 - chrono/agendas/migrations/0090_default_view.py | 1 - chrono/agendas/migrations/0092_change_recurrence_fields.py | 1 - chrono/agendas/migrations/0093_change_recurrence_fields.py | 1 - chrono/agendas/migrations/0094_change_recurrence_fields.py | 1 - chrono/agendas/migrations/0095_checked.py | 1 - chrono/agendas/migrations/0096_checked.py | 1 - .../agendas/migrations/0097_min_booking_delay_working_days.py | 1 - chrono/agendas/migrations/0098_event_booked_places.py | 1 - chrono/agendas/migrations/0099_event_triggers.py | 1 - chrono/agendas/migrations/0100_event_dml.py | 1 - chrono/agendas/migrations/0101_publication_datetime.py | 1 - chrono/agendas/migrations/0102_publication_datetime.py | 1 - chrono/agendas/migrations/0103_publication_datetime.py | 1 - chrono/agendas/migrations/0104_subscription.py | 1 - chrono/agendas/migrations/0105_subscription.py | 1 - chrono/agendas/migrations/0106_auto_20220202_1730.py | 1 - chrono/agendas/migrations/0107_auto_20220202_1730.py | 1 - chrono/agendas/migrations/0108_auto_20220202_1736.py | 1 - chrono/agendas/migrations/0109_auto_20220203_1051.py | 1 - ...aredcustodyagenda_sharedcustodyperiod_sharedcustodyrule.py | 1 - chrono/agendas/migrations/0111_timeperiod_weekday_indexes.py | 1 - chrono/agendas/migrations/0112_auto_20220323_1320.py | 1 - chrono/agendas/migrations/0113_auto_20220323_1708.py | 1 - chrono/agendas/migrations/0114_auto_20220324_1702.py | 1 - chrono/agendas/migrations/0115_events_type.py | 1 - chrono/agendas/migrations/0116_events_type.py | 1 - chrono/agendas/migrations/0117_events_type.py | 1 - chrono/agendas/migrations/0118_booking_out_of_min_delay.py | 1 - chrono/agendas/migrations/0119_check_types.py | 1 - chrono/agendas/migrations/0120_check_types.py | 1 - chrono/agendas/migrations/0121_user_check_type.py | 1 - chrono/agendas/migrations/0122_user_check_type.py | 1 - chrono/agendas/migrations/0123_user_check_type.py | 1 - chrono/agendas/migrations/0124_check_type_disabled.py | 1 - chrono/agendas/migrations/0125_auto_20220502_1134.py | 1 - chrono/agendas/migrations/0126_pricing.py | 1 - chrono/agendas/migrations/0127_remove_pricing_models.py | 1 - chrono/agendas/migrations/0128_event_date_range_constraint.py | 1 - chrono/agendas/migrations/0129_event_date_range_constraint.py | 1 - chrono/agendas/migrations/0130_event_date_range_constraint.py | 1 - chrono/agendas/migrations/0131_sharedcustodysettings.py | 1 - .../0132_sharedcustodysettings_holidays_calendar.py | 1 - chrono/agendas/migrations/0133_auto_20220628_1600.py | 1 - chrono/agendas/migrations/0134_remove_check_type.py | 1 - chrono/agendas/migrations/0135_remove_check_type.py | 1 - chrono/agendas/migrations/0136_remove_check_type.py | 1 - chrono/agendas/migrations/0137_remove_check_type.py | 1 - .../agendas/migrations/0138_sharedcustodyagenda_date_start.py | 1 - chrono/agendas/migrations/0139_auto_20220726_1017.py | 1 - chrono/agendas/migrations/0140_add_timeperiod_date_field.py | 1 - .../agendas/migrations/0141_shared_custody_add_child_field.py | 1 - .../migrations/0142_shared_custody_populate_child_field.py | 1 - .../migrations/0143_shared_custody_remove_children_field.py | 1 - .../agendas/migrations/0144_sharedcustodyagenda_date_end.py | 1 - chrono/agendas/migrations/0145_user_phone_number.py | 1 - chrono/agendas/migrations/0146_event_bigautofield.py | 1 - chrono/agendas/migrations/0147_check_future_events.py | 1 - chrono/agendas/migrations/0148_agenda_minimal_booking_time.py | 1 - chrono/utils/db.py | 1 - tests/api/fillslot/test_all.py | 2 +- tests/test_requests.py | 2 -- 150 files changed, 3 insertions(+), 152 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a4764a55..4cf4df86 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,10 +2,10 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 23.1.0 hooks: - id: black - args: ['--target-version', 'py37', '--skip-string-normalization', '--line-length', '110'] + args: ['--target-version', 'py39', '--skip-string-normalization', '--line-length', '110'] - repo: https://github.com/PyCQA/isort rev: 5.12.0 hooks: diff --git a/chrono/agendas/migrations/0001_initial.py b/chrono/agendas/migrations/0001_initial.py index f973c323..4e98215e 100644 --- a/chrono/agendas/migrations/0001_initial.py +++ b/chrono/agendas/migrations/0001_initial.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [] operations = [ diff --git a/chrono/agendas/migrations/0002_event.py b/chrono/agendas/migrations/0002_event.py index 23507d73..aa1fac7e 100644 --- a/chrono/agendas/migrations/0002_event.py +++ b/chrono/agendas/migrations/0002_event.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0001_initial'), ] diff --git a/chrono/agendas/migrations/0003_booking.py b/chrono/agendas/migrations/0003_booking.py index 21ae8cd1..9647b741 100644 --- a/chrono/agendas/migrations/0003_booking.py +++ b/chrono/agendas/migrations/0003_booking.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0002_event'), ] diff --git a/chrono/agendas/migrations/0004_booking_cancellation_datetime.py b/chrono/agendas/migrations/0004_booking_cancellation_datetime.py index 42d6d64b..1854aae3 100644 --- a/chrono/agendas/migrations/0004_booking_cancellation_datetime.py +++ b/chrono/agendas/migrations/0004_booking_cancellation_datetime.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0003_booking'), ] diff --git a/chrono/agendas/migrations/0005_event_label.py b/chrono/agendas/migrations/0005_event_label.py index d579fb88..89a1ceca 100644 --- a/chrono/agendas/migrations/0005_event_label.py +++ b/chrono/agendas/migrations/0005_event_label.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0004_booking_cancellation_datetime'), ] diff --git a/chrono/agendas/migrations/0006_auto_20160707_1357.py b/chrono/agendas/migrations/0006_auto_20160707_1357.py index 2de368c3..e4a3025a 100644 --- a/chrono/agendas/migrations/0006_auto_20160707_1357.py +++ b/chrono/agendas/migrations/0006_auto_20160707_1357.py @@ -6,7 +6,6 @@ from chrono.utils.timezone import utc class Migration(migrations.Migration): - dependencies = [ ('agendas', '0005_event_label'), ] diff --git a/chrono/agendas/migrations/0007_auto_20160722_1135.py b/chrono/agendas/migrations/0007_auto_20160722_1135.py index 3cb38afc..1c071e91 100644 --- a/chrono/agendas/migrations/0007_auto_20160722_1135.py +++ b/chrono/agendas/migrations/0007_auto_20160722_1135.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0006_auto_20160707_1357'), ] diff --git a/chrono/agendas/migrations/0008_auto_20160910_1319.py b/chrono/agendas/migrations/0008_auto_20160910_1319.py index 1ffa65bf..f26f1d0c 100644 --- a/chrono/agendas/migrations/0008_auto_20160910_1319.py +++ b/chrono/agendas/migrations/0008_auto_20160910_1319.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0007_auto_20160722_1135'), ] diff --git a/chrono/agendas/migrations/0009_auto_20160911_1640.py b/chrono/agendas/migrations/0009_auto_20160911_1640.py index 4e0fb075..3e626dda 100644 --- a/chrono/agendas/migrations/0009_auto_20160911_1640.py +++ b/chrono/agendas/migrations/0009_auto_20160911_1640.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0008_auto_20160910_1319'), ] diff --git a/chrono/agendas/migrations/0010_auto_20160918_1250.py b/chrono/agendas/migrations/0010_auto_20160918_1250.py index fe1b8e7e..5a2ef533 100644 --- a/chrono/agendas/migrations/0010_auto_20160918_1250.py +++ b/chrono/agendas/migrations/0010_auto_20160918_1250.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('auth', '0006_require_contenttypes_0002'), ('agendas', '0009_auto_20160911_1640'), diff --git a/chrono/agendas/migrations/0011_meetingtype_slug.py b/chrono/agendas/migrations/0011_meetingtype_slug.py index 093258f1..fbf61585 100644 --- a/chrono/agendas/migrations/0011_meetingtype_slug.py +++ b/chrono/agendas/migrations/0011_meetingtype_slug.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0010_auto_20160918_1250'), ] diff --git a/chrono/agendas/migrations/0012_manual_set_slugs_on_meeting_types.py b/chrono/agendas/migrations/0012_manual_set_slugs_on_meeting_types.py index 47fb53a1..c6d568e0 100644 --- a/chrono/agendas/migrations/0012_manual_set_slugs_on_meeting_types.py +++ b/chrono/agendas/migrations/0012_manual_set_slugs_on_meeting_types.py @@ -10,7 +10,6 @@ def set_slug_on_meeting_types(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0011_meetingtype_slug'), ] diff --git a/chrono/agendas/migrations/0013_auto_20161028_1603.py b/chrono/agendas/migrations/0013_auto_20161028_1603.py index c214cedd..c6aec981 100644 --- a/chrono/agendas/migrations/0013_auto_20161028_1603.py +++ b/chrono/agendas/migrations/0013_auto_20161028_1603.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0012_manual_set_slugs_on_meeting_types'), ] diff --git a/chrono/agendas/migrations/0014_booking_primary_booking.py b/chrono/agendas/migrations/0014_booking_primary_booking.py index 8a05071c..1e0cb74e 100644 --- a/chrono/agendas/migrations/0014_booking_primary_booking.py +++ b/chrono/agendas/migrations/0014_booking_primary_booking.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0013_auto_20161028_1603'), ] diff --git a/chrono/agendas/migrations/0015_auto_20170628_1137.py b/chrono/agendas/migrations/0015_auto_20170628_1137.py index 43a540d9..e8564d2f 100644 --- a/chrono/agendas/migrations/0015_auto_20170628_1137.py +++ b/chrono/agendas/migrations/0015_auto_20170628_1137.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0014_booking_primary_booking'), ] diff --git a/chrono/agendas/migrations/0016_desk.py b/chrono/agendas/migrations/0016_desk.py index 9413faed..12872a25 100644 --- a/chrono/agendas/migrations/0016_desk.py +++ b/chrono/agendas/migrations/0016_desk.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0015_auto_20170628_1137'), ] diff --git a/chrono/agendas/migrations/0017_timeperiod_desk.py b/chrono/agendas/migrations/0017_timeperiod_desk.py index c5a54b7e..36015aca 100644 --- a/chrono/agendas/migrations/0017_timeperiod_desk.py +++ b/chrono/agendas/migrations/0017_timeperiod_desk.py @@ -15,7 +15,6 @@ def unset_timeperiod_desk(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0016_desk'), ] diff --git a/chrono/agendas/migrations/0018_event_desk.py b/chrono/agendas/migrations/0018_event_desk.py index 492e8a01..eac96837 100644 --- a/chrono/agendas/migrations/0018_event_desk.py +++ b/chrono/agendas/migrations/0018_event_desk.py @@ -18,7 +18,6 @@ def unset_event_desk(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0017_timeperiod_desk'), ] diff --git a/chrono/agendas/migrations/0019_timeperiodexception.py b/chrono/agendas/migrations/0019_timeperiodexception.py index 1bafc032..bd5cf629 100644 --- a/chrono/agendas/migrations/0019_timeperiodexception.py +++ b/chrono/agendas/migrations/0019_timeperiodexception.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0018_event_desk'), ] diff --git a/chrono/agendas/migrations/0020_auto_20171102_1021.py b/chrono/agendas/migrations/0020_auto_20171102_1021.py index bc56bff9..930d3b32 100644 --- a/chrono/agendas/migrations/0020_auto_20171102_1021.py +++ b/chrono/agendas/migrations/0020_auto_20171102_1021.py @@ -6,7 +6,6 @@ from chrono.utils.timezone import utc class Migration(migrations.Migration): - dependencies = [ ('agendas', '0019_timeperiodexception'), ] diff --git a/chrono/agendas/migrations/0021_auto_20171126_1330.py b/chrono/agendas/migrations/0021_auto_20171126_1330.py index 01ab3960..22e704da 100644 --- a/chrono/agendas/migrations/0021_auto_20171126_1330.py +++ b/chrono/agendas/migrations/0021_auto_20171126_1330.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0020_auto_20171102_1021'), ] diff --git a/chrono/agendas/migrations/0022_auto_20171202_1828.py b/chrono/agendas/migrations/0022_auto_20171202_1828.py index bae09e10..5938fe89 100644 --- a/chrono/agendas/migrations/0022_auto_20171202_1828.py +++ b/chrono/agendas/migrations/0022_auto_20171202_1828.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0021_auto_20171126_1330'), ] diff --git a/chrono/agendas/migrations/0023_auto_20171202_1835.py b/chrono/agendas/migrations/0023_auto_20171202_1835.py index 78c895a8..5ac90b3f 100644 --- a/chrono/agendas/migrations/0023_auto_20171202_1835.py +++ b/chrono/agendas/migrations/0023_auto_20171202_1835.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0022_auto_20171202_1828'), ] diff --git a/chrono/agendas/migrations/0024_auto_20180426_1127.py b/chrono/agendas/migrations/0024_auto_20180426_1127.py index c6a70d05..50d53c8c 100644 --- a/chrono/agendas/migrations/0024_auto_20180426_1127.py +++ b/chrono/agendas/migrations/0024_auto_20180426_1127.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0023_auto_20171202_1835'), ] diff --git a/chrono/agendas/migrations/0025_auto_20181206_1252.py b/chrono/agendas/migrations/0025_auto_20181206_1252.py index d7f03083..d1eb59d8 100644 --- a/chrono/agendas/migrations/0025_auto_20181206_1252.py +++ b/chrono/agendas/migrations/0025_auto_20181206_1252.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0024_auto_20180426_1127'), ] diff --git a/chrono/agendas/migrations/0026_booking_user_display_label.py b/chrono/agendas/migrations/0026_booking_user_display_label.py index 4854e573..d4b7f7ec 100644 --- a/chrono/agendas/migrations/0026_booking_user_display_label.py +++ b/chrono/agendas/migrations/0026_booking_user_display_label.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0025_auto_20181206_1252'), ] diff --git a/chrono/agendas/migrations/0027_event_description.py b/chrono/agendas/migrations/0027_event_description.py index 7d38a331..2be149fe 100644 --- a/chrono/agendas/migrations/0027_event_description.py +++ b/chrono/agendas/migrations/0027_event_description.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0026_booking_user_display_label'), ] diff --git a/chrono/agendas/migrations/0028_event_slug.py b/chrono/agendas/migrations/0028_event_slug.py index f5cc1288..e311ecd3 100644 --- a/chrono/agendas/migrations/0028_event_slug.py +++ b/chrono/agendas/migrations/0028_event_slug.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0027_event_description'), ] diff --git a/chrono/agendas/migrations/0029_auto_20191106_1320.py b/chrono/agendas/migrations/0029_auto_20191106_1320.py index 358376ff..48a4379f 100644 --- a/chrono/agendas/migrations/0029_auto_20191106_1320.py +++ b/chrono/agendas/migrations/0029_auto_20191106_1320.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0028_event_slug'), ] diff --git a/chrono/agendas/migrations/0030_auto_20191107_1200.py b/chrono/agendas/migrations/0030_auto_20191107_1200.py index 2cff44ba..9f980dde 100644 --- a/chrono/agendas/migrations/0030_auto_20191107_1200.py +++ b/chrono/agendas/migrations/0030_auto_20191107_1200.py @@ -47,7 +47,6 @@ def set_slug_on_meetingtypes(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0029_auto_20191106_1320'), ] diff --git a/chrono/agendas/migrations/0031_auto_20191107_1225.py b/chrono/agendas/migrations/0031_auto_20191107_1225.py index 59ea403a..e820a37e 100644 --- a/chrono/agendas/migrations/0031_auto_20191107_1225.py +++ b/chrono/agendas/migrations/0031_auto_20191107_1225.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0030_auto_20191107_1200'), ] diff --git a/chrono/agendas/migrations/0032_auto_20191127_0919.py b/chrono/agendas/migrations/0032_auto_20191127_0919.py index ebd44960..23e3971a 100644 --- a/chrono/agendas/migrations/0032_auto_20191127_0919.py +++ b/chrono/agendas/migrations/0032_auto_20191127_0919.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0031_auto_20191107_1225'), ] diff --git a/chrono/agendas/migrations/0033_timeperiodexceptionsource.py b/chrono/agendas/migrations/0033_timeperiodexceptionsource.py index 35fc626a..a11d2195 100644 --- a/chrono/agendas/migrations/0033_timeperiodexceptionsource.py +++ b/chrono/agendas/migrations/0033_timeperiodexceptionsource.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0032_auto_20191127_0919'), ] diff --git a/chrono/agendas/migrations/0034_initial_source.py b/chrono/agendas/migrations/0034_initial_source.py index 75326c49..b69b7897 100644 --- a/chrono/agendas/migrations/0034_initial_source.py +++ b/chrono/agendas/migrations/0034_initial_source.py @@ -36,7 +36,6 @@ def init_remote_url(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0033_timeperiodexceptionsource'), ] diff --git a/chrono/agendas/migrations/0035_remove_desk_timeperiod_exceptions_remote_url.py b/chrono/agendas/migrations/0035_remove_desk_timeperiod_exceptions_remote_url.py index 76931507..81704b11 100644 --- a/chrono/agendas/migrations/0035_remove_desk_timeperiod_exceptions_remote_url.py +++ b/chrono/agendas/migrations/0035_remove_desk_timeperiod_exceptions_remote_url.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0034_initial_source'), ] diff --git a/chrono/agendas/migrations/0036_auto_20191223_1758.py b/chrono/agendas/migrations/0036_auto_20191223_1758.py index 6c7b66a7..280740c4 100644 --- a/chrono/agendas/migrations/0036_auto_20191223_1758.py +++ b/chrono/agendas/migrations/0036_auto_20191223_1758.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0035_remove_desk_timeperiod_exceptions_remote_url'), ] diff --git a/chrono/agendas/migrations/0037_timeperiodexceptionsource_ics_file.py b/chrono/agendas/migrations/0037_timeperiodexceptionsource_ics_file.py index ec2a6a74..eb71868b 100644 --- a/chrono/agendas/migrations/0037_timeperiodexceptionsource_ics_file.py +++ b/chrono/agendas/migrations/0037_timeperiodexceptionsource_ics_file.py @@ -4,7 +4,6 @@ import chrono.agendas.models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0036_auto_20191223_1758'), ] diff --git a/chrono/agendas/migrations/0038_start_virtual_agendas.py b/chrono/agendas/migrations/0038_start_virtual_agendas.py index 8b8d6d76..cda8f478 100644 --- a/chrono/agendas/migrations/0038_start_virtual_agendas.py +++ b/chrono/agendas/migrations/0038_start_virtual_agendas.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0037_timeperiodexceptionsource_ics_file'), ] diff --git a/chrono/agendas/migrations/0039_booking_delays.py b/chrono/agendas/migrations/0039_booking_delays.py index f81d7971..0a269609 100644 --- a/chrono/agendas/migrations/0039_booking_delays.py +++ b/chrono/agendas/migrations/0039_booking_delays.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0038_start_virtual_agendas'), ] diff --git a/chrono/agendas/migrations/0040_timeperiod_agenda.py b/chrono/agendas/migrations/0040_timeperiod_agenda.py index 70afb184..bf91b4e2 100644 --- a/chrono/agendas/migrations/0040_timeperiod_agenda.py +++ b/chrono/agendas/migrations/0040_timeperiod_agenda.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0039_booking_delays'), ] diff --git a/chrono/agendas/migrations/0041_clean_event_slug_unicity.py b/chrono/agendas/migrations/0041_clean_event_slug_unicity.py index 9dea61dc..5b5f2af3 100644 --- a/chrono/agendas/migrations/0041_clean_event_slug_unicity.py +++ b/chrono/agendas/migrations/0041_clean_event_slug_unicity.py @@ -20,7 +20,6 @@ def clean_constraint(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0040_timeperiod_agenda'), ] diff --git a/chrono/agendas/migrations/0042_auto_20200503_1231.py b/chrono/agendas/migrations/0042_auto_20200503_1231.py index 409aadb9..bca9e943 100644 --- a/chrono/agendas/migrations/0042_auto_20200503_1231.py +++ b/chrono/agendas/migrations/0042_auto_20200503_1231.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0041_clean_event_slug_unicity'), ] diff --git a/chrono/agendas/migrations/0043_booking_user_external_id.py b/chrono/agendas/migrations/0043_booking_user_external_id.py index 5d2f907b..1753ea77 100644 --- a/chrono/agendas/migrations/0043_booking_user_external_id.py +++ b/chrono/agendas/migrations/0043_booking_user_external_id.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0042_auto_20200503_1231'), ] diff --git a/chrono/agendas/migrations/0044_event_publication_date.py b/chrono/agendas/migrations/0044_event_publication_date.py index b5dffb8b..6252674f 100644 --- a/chrono/agendas/migrations/0044_event_publication_date.py +++ b/chrono/agendas/migrations/0044_event_publication_date.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0043_booking_user_external_id'), ] diff --git a/chrono/agendas/migrations/0045_agenda_resources.py b/chrono/agendas/migrations/0045_agenda_resources.py index 7a950030..78695a2d 100644 --- a/chrono/agendas/migrations/0045_agenda_resources.py +++ b/chrono/agendas/migrations/0045_agenda_resources.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0044_event_publication_date'), ] diff --git a/chrono/agendas/migrations/0046_event_duration.py b/chrono/agendas/migrations/0046_event_duration.py index a6dd2fa4..18f6ea70 100644 --- a/chrono/agendas/migrations/0046_event_duration.py +++ b/chrono/agendas/migrations/0046_event_duration.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0045_agenda_resources'), ] diff --git a/chrono/agendas/migrations/0047_auto_20200617_1521.py b/chrono/agendas/migrations/0047_auto_20200617_1521.py index c8619555..b371997d 100644 --- a/chrono/agendas/migrations/0047_auto_20200617_1521.py +++ b/chrono/agendas/migrations/0047_auto_20200617_1521.py @@ -6,7 +6,6 @@ import chrono.agendas.models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0046_event_duration'), ] diff --git a/chrono/agendas/migrations/0048_meeting_type_deleted_flag.py b/chrono/agendas/migrations/0048_meeting_type_deleted_flag.py index 9badddce..6740c799 100644 --- a/chrono/agendas/migrations/0048_meeting_type_deleted_flag.py +++ b/chrono/agendas/migrations/0048_meeting_type_deleted_flag.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0047_auto_20200617_1521'), ] diff --git a/chrono/agendas/migrations/0049_event_slug.py b/chrono/agendas/migrations/0049_event_slug.py index e38a36ba..4e745877 100644 --- a/chrono/agendas/migrations/0049_event_slug.py +++ b/chrono/agendas/migrations/0049_event_slug.py @@ -33,7 +33,6 @@ def set_slug_on_events(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0048_meeting_type_deleted_flag'), ] diff --git a/chrono/agendas/migrations/0050_event_slug.py b/chrono/agendas/migrations/0050_event_slug.py index 44c0ecf3..09605f17 100644 --- a/chrono/agendas/migrations/0050_event_slug.py +++ b/chrono/agendas/migrations/0050_event_slug.py @@ -4,7 +4,6 @@ import chrono.agendas.models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0049_event_slug'), ] diff --git a/chrono/agendas/migrations/0051_default_view.py b/chrono/agendas/migrations/0051_default_view.py index 1cfd4db3..20863864 100644 --- a/chrono/agendas/migrations/0051_default_view.py +++ b/chrono/agendas/migrations/0051_default_view.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0050_event_slug'), ] diff --git a/chrono/agendas/migrations/0052_event_date_range_constraint.py b/chrono/agendas/migrations/0052_event_date_range_constraint.py index a07e6e3e..10a6baa6 100644 --- a/chrono/agendas/migrations/0052_event_date_range_constraint.py +++ b/chrono/agendas/migrations/0052_event_date_range_constraint.py @@ -48,7 +48,6 @@ ALTER TABLE agendas_event DROP COLUMN _ignore_reason; class Migration(migrations.Migration): - dependencies = [ ('agendas', '0051_default_view'), ] diff --git a/chrono/agendas/migrations/0053_event_date_range_constraint.py b/chrono/agendas/migrations/0053_event_date_range_constraint.py index e187ba25..00cfd486 100644 --- a/chrono/agendas/migrations/0053_event_date_range_constraint.py +++ b/chrono/agendas/migrations/0053_event_date_range_constraint.py @@ -14,7 +14,6 @@ ALTER TABLE agendas_event DROP CONSTRAINT tstzrange_constraint; class Migration(migrations.Migration): - dependencies = [ ('agendas', '0052_event_date_range_constraint'), ] diff --git a/chrono/agendas/migrations/0054_agenda_categories.py b/chrono/agendas/migrations/0054_agenda_categories.py index 216ea287..4c13a12c 100644 --- a/chrono/agendas/migrations/0054_agenda_categories.py +++ b/chrono/agendas/migrations/0054_agenda_categories.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0053_event_date_range_constraint'), ] diff --git a/chrono/agendas/migrations/0055_booking_cancel_callback_url.py b/chrono/agendas/migrations/0055_booking_cancel_callback_url.py index 941f9913..1366feab 100644 --- a/chrono/agendas/migrations/0055_booking_cancel_callback_url.py +++ b/chrono/agendas/migrations/0055_booking_cancel_callback_url.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0054_agenda_categories'), ] diff --git a/chrono/agendas/migrations/0056_auto_20200811_1611.py b/chrono/agendas/migrations/0056_auto_20200811_1611.py index 2896ab05..5da62e52 100644 --- a/chrono/agendas/migrations/0056_auto_20200811_1611.py +++ b/chrono/agendas/migrations/0056_auto_20200811_1611.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0055_booking_cancel_callback_url'), ] diff --git a/chrono/agendas/migrations/0057_auto_20200831_1634.py b/chrono/agendas/migrations/0057_auto_20200831_1634.py index 34fb7dfe..508b6e22 100644 --- a/chrono/agendas/migrations/0057_auto_20200831_1634.py +++ b/chrono/agendas/migrations/0057_auto_20200831_1634.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0056_auto_20200811_1611'), ] diff --git a/chrono/agendas/migrations/0058_timeperiodexception_external.py b/chrono/agendas/migrations/0058_timeperiodexception_external.py index 9f3a122f..ba80f0d1 100644 --- a/chrono/agendas/migrations/0058_timeperiodexception_external.py +++ b/chrono/agendas/migrations/0058_timeperiodexception_external.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0057_auto_20200831_1634'), ] diff --git a/chrono/agendas/migrations/0059_event_almost_full.py b/chrono/agendas/migrations/0059_event_almost_full.py index dcf4cdc4..74eb6f4f 100644 --- a/chrono/agendas/migrations/0059_event_almost_full.py +++ b/chrono/agendas/migrations/0059_event_almost_full.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0058_timeperiodexception_external'), ] diff --git a/chrono/agendas/migrations/0060_auto_20200903_1041.py b/chrono/agendas/migrations/0060_auto_20200903_1041.py index e8450b06..e5eea9c9 100644 --- a/chrono/agendas/migrations/0060_auto_20200903_1041.py +++ b/chrono/agendas/migrations/0060_auto_20200903_1041.py @@ -6,7 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0059_event_almost_full'), ] diff --git a/chrono/agendas/migrations/0061_auto_20200909_1752.py b/chrono/agendas/migrations/0061_auto_20200909_1752.py index 1ca7ac45..0bb4bfd9 100644 --- a/chrono/agendas/migrations/0061_auto_20200909_1752.py +++ b/chrono/agendas/migrations/0061_auto_20200909_1752.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0060_auto_20200903_1041'), ] diff --git a/chrono/agendas/migrations/0062_auto_20200915_1401.py b/chrono/agendas/migrations/0062_auto_20200915_1401.py index caaea534..8f0c2106 100644 --- a/chrono/agendas/migrations/0062_auto_20200915_1401.py +++ b/chrono/agendas/migrations/0062_auto_20200915_1401.py @@ -7,7 +7,6 @@ import chrono class Migration(migrations.Migration): - dependencies = [ ('agendas', '0061_auto_20200909_1752'), ] diff --git a/chrono/agendas/migrations/0063_auto_20200928_1445.py b/chrono/agendas/migrations/0063_auto_20200928_1445.py index df3cef1d..ed5bb500 100644 --- a/chrono/agendas/migrations/0063_auto_20200928_1445.py +++ b/chrono/agendas/migrations/0063_auto_20200928_1445.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0062_auto_20200915_1401'), ] diff --git a/chrono/agendas/migrations/0064_booking_form_url.py b/chrono/agendas/migrations/0064_booking_form_url.py index fe5d4eb9..6d757875 100644 --- a/chrono/agendas/migrations/0064_booking_form_url.py +++ b/chrono/agendas/migrations/0064_booking_form_url.py @@ -4,7 +4,6 @@ import chrono.agendas.models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0063_auto_20200928_1445'), ] diff --git a/chrono/agendas/migrations/0065_unavailability_calendar.py b/chrono/agendas/migrations/0065_unavailability_calendar.py index ab7071e3..1e6d4678 100644 --- a/chrono/agendas/migrations/0065_unavailability_calendar.py +++ b/chrono/agendas/migrations/0065_unavailability_calendar.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('auth', '0008_alter_user_username_max_length'), ('agendas', '0064_booking_form_url'), diff --git a/chrono/agendas/migrations/0066_timeperiodexceptionsource_unique_settings_slug.py b/chrono/agendas/migrations/0066_timeperiodexceptionsource_unique_settings_slug.py index d17a701a..0a600598 100644 --- a/chrono/agendas/migrations/0066_timeperiodexceptionsource_unique_settings_slug.py +++ b/chrono/agendas/migrations/0066_timeperiodexceptionsource_unique_settings_slug.py @@ -36,7 +36,6 @@ def remove_duplicate_sources(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0065_unavailability_calendar'), ] diff --git a/chrono/agendas/migrations/0067_auto_20201021_1746.py b/chrono/agendas/migrations/0067_auto_20201021_1746.py index dc3e6d00..14371ad1 100644 --- a/chrono/agendas/migrations/0067_auto_20201021_1746.py +++ b/chrono/agendas/migrations/0067_auto_20201021_1746.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0066_timeperiodexceptionsource_unique_settings_slug'), ] diff --git a/chrono/agendas/migrations/0068_remove_timeperiodexception_external.py b/chrono/agendas/migrations/0068_remove_timeperiodexception_external.py index 9d1fb852..9a90af60 100644 --- a/chrono/agendas/migrations/0068_remove_timeperiodexception_external.py +++ b/chrono/agendas/migrations/0068_remove_timeperiodexception_external.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0067_auto_20201021_1746'), ] diff --git a/chrono/agendas/migrations/0069_translate_holidays.py b/chrono/agendas/migrations/0069_translate_holidays.py index 8e319134..c68db1b8 100644 --- a/chrono/agendas/migrations/0069_translate_holidays.py +++ b/chrono/agendas/migrations/0069_translate_holidays.py @@ -28,7 +28,6 @@ def translate_holidays_exceptions(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0068_remove_timeperiodexception_external'), ] diff --git a/chrono/agendas/migrations/0070_auto_20201202_1834.py b/chrono/agendas/migrations/0070_auto_20201202_1834.py index 99eb88d5..15c6de33 100644 --- a/chrono/agendas/migrations/0070_auto_20201202_1834.py +++ b/chrono/agendas/migrations/0070_auto_20201202_1834.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0069_translate_holidays'), ] diff --git a/chrono/agendas/migrations/0071_booking_attendance.py b/chrono/agendas/migrations/0071_booking_attendance.py index bb15903f..9c240925 100644 --- a/chrono/agendas/migrations/0071_booking_attendance.py +++ b/chrono/agendas/migrations/0071_booking_attendance.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0070_auto_20201202_1834'), ] diff --git a/chrono/agendas/migrations/0072_booking_absence_reason.py b/chrono/agendas/migrations/0072_booking_absence_reason.py index b294ae1a..027d8946 100644 --- a/chrono/agendas/migrations/0072_booking_absence_reason.py +++ b/chrono/agendas/migrations/0072_booking_absence_reason.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0071_booking_attendance'), ] diff --git a/chrono/agendas/migrations/0074_simple_desks.py b/chrono/agendas/migrations/0074_simple_desks.py index 6a76df86..190749d2 100644 --- a/chrono/agendas/migrations/0074_simple_desks.py +++ b/chrono/agendas/migrations/0074_simple_desks.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0073_auto_20210125_1800'), ] diff --git a/chrono/agendas/migrations/0075_auto_20210216_1553.py b/chrono/agendas/migrations/0075_auto_20210216_1553.py index e48f2ac9..a2944706 100644 --- a/chrono/agendas/migrations/0075_auto_20210216_1553.py +++ b/chrono/agendas/migrations/0075_auto_20210216_1553.py @@ -6,7 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0074_simple_desks'), ] diff --git a/chrono/agendas/migrations/0076_event_recurrence_end_date.py b/chrono/agendas/migrations/0076_event_recurrence_end_date.py index 6937bae9..6bbe16c7 100644 --- a/chrono/agendas/migrations/0076_event_recurrence_end_date.py +++ b/chrono/agendas/migrations/0076_event_recurrence_end_date.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0075_auto_20210216_1553'), ] diff --git a/chrono/agendas/migrations/0077_meetings_default_view.py b/chrono/agendas/migrations/0077_meetings_default_view.py index d1a37e97..a83e1961 100644 --- a/chrono/agendas/migrations/0077_meetings_default_view.py +++ b/chrono/agendas/migrations/0077_meetings_default_view.py @@ -7,7 +7,6 @@ def set_default_view(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0076_event_recurrence_end_date'), ] diff --git a/chrono/agendas/migrations/0078_absence_reasons.py b/chrono/agendas/migrations/0078_absence_reasons.py index 1e0b04cf..b2723260 100644 --- a/chrono/agendas/migrations/0078_absence_reasons.py +++ b/chrono/agendas/migrations/0078_absence_reasons.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0077_meetings_default_view'), ] diff --git a/chrono/agendas/migrations/0079_auto_20210428_1533.py b/chrono/agendas/migrations/0079_auto_20210428_1533.py index 0402391e..b7c7e34d 100644 --- a/chrono/agendas/migrations/0079_auto_20210428_1533.py +++ b/chrono/agendas/migrations/0079_auto_20210428_1533.py @@ -12,7 +12,6 @@ def remove_recurrence_end_date(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0078_absence_reasons'), ] diff --git a/chrono/agendas/migrations/0080_create_exceptions_desks.py b/chrono/agendas/migrations/0080_create_exceptions_desks.py index fa3ac501..57c0de2c 100644 --- a/chrono/agendas/migrations/0080_create_exceptions_desks.py +++ b/chrono/agendas/migrations/0080_create_exceptions_desks.py @@ -15,7 +15,6 @@ def create_exceptions_desk(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0079_auto_20210428_1533'), ] diff --git a/chrono/agendas/migrations/0081_recurrenceexceptionsreport.py b/chrono/agendas/migrations/0081_recurrenceexceptionsreport.py index 9fa640a1..42c5c00f 100644 --- a/chrono/agendas/migrations/0081_recurrenceexceptionsreport.py +++ b/chrono/agendas/migrations/0081_recurrenceexceptionsreport.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0080_create_exceptions_desks'), ] diff --git a/chrono/agendas/migrations/0082_text_to_jsonb.py b/chrono/agendas/migrations/0082_text_to_jsonb.py index d8ba654a..0278e378 100644 --- a/chrono/agendas/migrations/0082_text_to_jsonb.py +++ b/chrono/agendas/migrations/0082_text_to_jsonb.py @@ -4,7 +4,6 @@ from chrono.utils.db import EnsureJsonbType class Migration(migrations.Migration): - dependencies = [ ('agendas', '0081_recurrenceexceptionsreport'), ] diff --git a/chrono/agendas/migrations/0083_reason_slug.py b/chrono/agendas/migrations/0083_reason_slug.py index af2928ff..5686fc1d 100644 --- a/chrono/agendas/migrations/0083_reason_slug.py +++ b/chrono/agendas/migrations/0083_reason_slug.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0082_text_to_jsonb'), ] diff --git a/chrono/agendas/migrations/0084_reason_slug.py b/chrono/agendas/migrations/0084_reason_slug.py index 408c273f..ac338393 100644 --- a/chrono/agendas/migrations/0084_reason_slug.py +++ b/chrono/agendas/migrations/0084_reason_slug.py @@ -30,7 +30,6 @@ def set_slug_on_absence_reasons(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0083_reason_slug'), ] diff --git a/chrono/agendas/migrations/0085_reason_slug.py b/chrono/agendas/migrations/0085_reason_slug.py index c8dcd5d3..081710d0 100644 --- a/chrono/agendas/migrations/0085_reason_slug.py +++ b/chrono/agendas/migrations/0085_reason_slug.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0084_reason_slug'), ] diff --git a/chrono/agendas/migrations/0086_booking_user_block_template.py b/chrono/agendas/migrations/0086_booking_user_block_template.py index bbc35cd9..f22cc912 100644 --- a/chrono/agendas/migrations/0086_booking_user_block_template.py +++ b/chrono/agendas/migrations/0086_booking_user_block_template.py @@ -4,7 +4,6 @@ import chrono.agendas.models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0085_reason_slug'), ] diff --git a/chrono/agendas/migrations/0087_booking_user_name.py b/chrono/agendas/migrations/0087_booking_user_name.py index a213ab0b..b4b09b74 100644 --- a/chrono/agendas/migrations/0087_booking_user_name.py +++ b/chrono/agendas/migrations/0087_booking_user_name.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0086_booking_user_block_template'), ] diff --git a/chrono/agendas/migrations/0088_booking_check_filters.py b/chrono/agendas/migrations/0088_booking_check_filters.py index 7cf76dea..655eb089 100644 --- a/chrono/agendas/migrations/0088_booking_check_filters.py +++ b/chrono/agendas/migrations/0088_booking_check_filters.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0087_booking_user_name'), ] diff --git a/chrono/agendas/migrations/0089_agenda_event_display_template.py b/chrono/agendas/migrations/0089_agenda_event_display_template.py index c5a9ff3b..a809e701 100644 --- a/chrono/agendas/migrations/0089_agenda_event_display_template.py +++ b/chrono/agendas/migrations/0089_agenda_event_display_template.py @@ -4,7 +4,6 @@ import chrono.agendas.models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0088_booking_check_filters'), ] diff --git a/chrono/agendas/migrations/0090_default_view.py b/chrono/agendas/migrations/0090_default_view.py index a134ed65..2cb30af9 100644 --- a/chrono/agendas/migrations/0090_default_view.py +++ b/chrono/agendas/migrations/0090_default_view.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0089_agenda_event_display_template'), ] diff --git a/chrono/agendas/migrations/0092_change_recurrence_fields.py b/chrono/agendas/migrations/0092_change_recurrence_fields.py index 81ae4ff6..3b8849a8 100644 --- a/chrono/agendas/migrations/0092_change_recurrence_fields.py +++ b/chrono/agendas/migrations/0092_change_recurrence_fields.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0090_default_view'), ] diff --git a/chrono/agendas/migrations/0093_change_recurrence_fields.py b/chrono/agendas/migrations/0093_change_recurrence_fields.py index 0cb91149..7b26bd24 100644 --- a/chrono/agendas/migrations/0093_change_recurrence_fields.py +++ b/chrono/agendas/migrations/0093_change_recurrence_fields.py @@ -38,7 +38,6 @@ def reverse_migrate_recurrence_fields(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0092_change_recurrence_fields'), ] diff --git a/chrono/agendas/migrations/0094_change_recurrence_fields.py b/chrono/agendas/migrations/0094_change_recurrence_fields.py index 1048ae67..5e89fe60 100644 --- a/chrono/agendas/migrations/0094_change_recurrence_fields.py +++ b/chrono/agendas/migrations/0094_change_recurrence_fields.py @@ -3,7 +3,6 @@ from django.db.utils import ProgrammingError class Migration(migrations.Migration): - dependencies = [ ('agendas', '0093_change_recurrence_fields'), ] diff --git a/chrono/agendas/migrations/0095_checked.py b/chrono/agendas/migrations/0095_checked.py index bfb07688..e7bdf33a 100644 --- a/chrono/agendas/migrations/0095_checked.py +++ b/chrono/agendas/migrations/0095_checked.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0094_change_recurrence_fields'), ] diff --git a/chrono/agendas/migrations/0096_checked.py b/chrono/agendas/migrations/0096_checked.py index 5b3655ae..dba8e8f9 100644 --- a/chrono/agendas/migrations/0096_checked.py +++ b/chrono/agendas/migrations/0096_checked.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0095_checked'), ] diff --git a/chrono/agendas/migrations/0097_min_booking_delay_working_days.py b/chrono/agendas/migrations/0097_min_booking_delay_working_days.py index 183c9221..ebbceb29 100644 --- a/chrono/agendas/migrations/0097_min_booking_delay_working_days.py +++ b/chrono/agendas/migrations/0097_min_booking_delay_working_days.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0096_checked'), ] diff --git a/chrono/agendas/migrations/0098_event_booked_places.py b/chrono/agendas/migrations/0098_event_booked_places.py index e4dc5f34..5dad50af 100644 --- a/chrono/agendas/migrations/0098_event_booked_places.py +++ b/chrono/agendas/migrations/0098_event_booked_places.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0097_min_booking_delay_working_days'), ] diff --git a/chrono/agendas/migrations/0099_event_triggers.py b/chrono/agendas/migrations/0099_event_triggers.py index 585d9650..0c28ba1e 100644 --- a/chrono/agendas/migrations/0099_event_triggers.py +++ b/chrono/agendas/migrations/0099_event_triggers.py @@ -19,7 +19,6 @@ DROP FUNCTION IF EXISTS update_event_places_fields; class Migration(migrations.Migration): - dependencies = [ ('agendas', '0098_event_booked_places'), ] diff --git a/chrono/agendas/migrations/0100_event_dml.py b/chrono/agendas/migrations/0100_event_dml.py index 491ede44..1104ea4e 100644 --- a/chrono/agendas/migrations/0100_event_dml.py +++ b/chrono/agendas/migrations/0100_event_dml.py @@ -5,7 +5,6 @@ sql_forwards = """UPDATE agendas_event SET id=id;""" class Migration(migrations.Migration): - dependencies = [ ('agendas', '0099_event_triggers'), ] diff --git a/chrono/agendas/migrations/0101_publication_datetime.py b/chrono/agendas/migrations/0101_publication_datetime.py index 5c23e46a..4380ebca 100644 --- a/chrono/agendas/migrations/0101_publication_datetime.py +++ b/chrono/agendas/migrations/0101_publication_datetime.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0100_event_dml'), ] diff --git a/chrono/agendas/migrations/0102_publication_datetime.py b/chrono/agendas/migrations/0102_publication_datetime.py index 2f79d86b..20afff58 100644 --- a/chrono/agendas/migrations/0102_publication_datetime.py +++ b/chrono/agendas/migrations/0102_publication_datetime.py @@ -28,7 +28,6 @@ def backwards(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0101_publication_datetime'), ] diff --git a/chrono/agendas/migrations/0103_publication_datetime.py b/chrono/agendas/migrations/0103_publication_datetime.py index d5a3915b..0b2cf23d 100644 --- a/chrono/agendas/migrations/0103_publication_datetime.py +++ b/chrono/agendas/migrations/0103_publication_datetime.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0102_publication_datetime'), ] diff --git a/chrono/agendas/migrations/0104_subscription.py b/chrono/agendas/migrations/0104_subscription.py index 6d152e1a..98bd1785 100644 --- a/chrono/agendas/migrations/0104_subscription.py +++ b/chrono/agendas/migrations/0104_subscription.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0103_publication_datetime'), ] diff --git a/chrono/agendas/migrations/0105_subscription.py b/chrono/agendas/migrations/0105_subscription.py index 88d1ec13..52dcf623 100644 --- a/chrono/agendas/migrations/0105_subscription.py +++ b/chrono/agendas/migrations/0105_subscription.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0104_subscription'), ] diff --git a/chrono/agendas/migrations/0106_auto_20220202_1730.py b/chrono/agendas/migrations/0106_auto_20220202_1730.py index 5243a83a..d6c0d813 100644 --- a/chrono/agendas/migrations/0106_auto_20220202_1730.py +++ b/chrono/agendas/migrations/0106_auto_20220202_1730.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0105_subscription'), ] diff --git a/chrono/agendas/migrations/0107_auto_20220202_1730.py b/chrono/agendas/migrations/0107_auto_20220202_1730.py index 1e782a1b..0e9b0439 100644 --- a/chrono/agendas/migrations/0107_auto_20220202_1730.py +++ b/chrono/agendas/migrations/0107_auto_20220202_1730.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0106_auto_20220202_1730'), ] diff --git a/chrono/agendas/migrations/0108_auto_20220202_1736.py b/chrono/agendas/migrations/0108_auto_20220202_1736.py index 009773f4..e62630e8 100644 --- a/chrono/agendas/migrations/0108_auto_20220202_1736.py +++ b/chrono/agendas/migrations/0108_auto_20220202_1736.py @@ -20,7 +20,6 @@ def migrate_reminder_fields(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0107_auto_20220202_1730'), ] diff --git a/chrono/agendas/migrations/0109_auto_20220203_1051.py b/chrono/agendas/migrations/0109_auto_20220203_1051.py index 2999ffaa..607b21e9 100644 --- a/chrono/agendas/migrations/0109_auto_20220203_1051.py +++ b/chrono/agendas/migrations/0109_auto_20220203_1051.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0108_auto_20220202_1736'), ] diff --git a/chrono/agendas/migrations/0110_person_sharedcustodyagenda_sharedcustodyperiod_sharedcustodyrule.py b/chrono/agendas/migrations/0110_person_sharedcustodyagenda_sharedcustodyperiod_sharedcustodyrule.py index a3d91bae..1669fbe9 100644 --- a/chrono/agendas/migrations/0110_person_sharedcustodyagenda_sharedcustodyperiod_sharedcustodyrule.py +++ b/chrono/agendas/migrations/0110_person_sharedcustodyagenda_sharedcustodyperiod_sharedcustodyrule.py @@ -6,7 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0109_auto_20220203_1051'), ] diff --git a/chrono/agendas/migrations/0111_timeperiod_weekday_indexes.py b/chrono/agendas/migrations/0111_timeperiod_weekday_indexes.py index 4325e8a2..cdc1689c 100644 --- a/chrono/agendas/migrations/0111_timeperiod_weekday_indexes.py +++ b/chrono/agendas/migrations/0111_timeperiod_weekday_indexes.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0110_person_sharedcustodyagenda_sharedcustodyperiod_sharedcustodyrule'), ] diff --git a/chrono/agendas/migrations/0112_auto_20220323_1320.py b/chrono/agendas/migrations/0112_auto_20220323_1320.py index f9e68c2f..15b19e57 100644 --- a/chrono/agendas/migrations/0112_auto_20220323_1320.py +++ b/chrono/agendas/migrations/0112_auto_20220323_1320.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0111_timeperiod_weekday_indexes'), ] diff --git a/chrono/agendas/migrations/0113_auto_20220323_1708.py b/chrono/agendas/migrations/0113_auto_20220323_1708.py index bfdca11e..0bc2c0f7 100644 --- a/chrono/agendas/migrations/0113_auto_20220323_1708.py +++ b/chrono/agendas/migrations/0113_auto_20220323_1708.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0112_auto_20220323_1320'), ] diff --git a/chrono/agendas/migrations/0114_auto_20220324_1702.py b/chrono/agendas/migrations/0114_auto_20220324_1702.py index 4febe950..9e58be54 100644 --- a/chrono/agendas/migrations/0114_auto_20220324_1702.py +++ b/chrono/agendas/migrations/0114_auto_20220324_1702.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0113_auto_20220323_1708'), ] diff --git a/chrono/agendas/migrations/0115_events_type.py b/chrono/agendas/migrations/0115_events_type.py index 948a8aa7..5631040f 100644 --- a/chrono/agendas/migrations/0115_events_type.py +++ b/chrono/agendas/migrations/0115_events_type.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0114_auto_20220324_1702'), ] diff --git a/chrono/agendas/migrations/0116_events_type.py b/chrono/agendas/migrations/0116_events_type.py index 75171cc6..01ce889c 100644 --- a/chrono/agendas/migrations/0116_events_type.py +++ b/chrono/agendas/migrations/0116_events_type.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0115_events_type'), ] diff --git a/chrono/agendas/migrations/0117_events_type.py b/chrono/agendas/migrations/0117_events_type.py index bd2fe945..037aef1f 100644 --- a/chrono/agendas/migrations/0117_events_type.py +++ b/chrono/agendas/migrations/0117_events_type.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0116_events_type'), ] diff --git a/chrono/agendas/migrations/0118_booking_out_of_min_delay.py b/chrono/agendas/migrations/0118_booking_out_of_min_delay.py index a075634d..bebf0ff5 100644 --- a/chrono/agendas/migrations/0118_booking_out_of_min_delay.py +++ b/chrono/agendas/migrations/0118_booking_out_of_min_delay.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0117_events_type'), ] diff --git a/chrono/agendas/migrations/0119_check_types.py b/chrono/agendas/migrations/0119_check_types.py index a4a1218e..09da2bd4 100644 --- a/chrono/agendas/migrations/0119_check_types.py +++ b/chrono/agendas/migrations/0119_check_types.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0118_booking_out_of_min_delay'), ] diff --git a/chrono/agendas/migrations/0120_check_types.py b/chrono/agendas/migrations/0120_check_types.py index ae4018d6..1a1d4ff0 100644 --- a/chrono/agendas/migrations/0120_check_types.py +++ b/chrono/agendas/migrations/0120_check_types.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0119_check_types'), ] diff --git a/chrono/agendas/migrations/0121_user_check_type.py b/chrono/agendas/migrations/0121_user_check_type.py index fe0bc1a2..809cb014 100644 --- a/chrono/agendas/migrations/0121_user_check_type.py +++ b/chrono/agendas/migrations/0121_user_check_type.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0120_check_types'), ] diff --git a/chrono/agendas/migrations/0122_user_check_type.py b/chrono/agendas/migrations/0122_user_check_type.py index 652a998f..a8112948 100644 --- a/chrono/agendas/migrations/0122_user_check_type.py +++ b/chrono/agendas/migrations/0122_user_check_type.py @@ -35,7 +35,6 @@ def backwards(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0121_user_check_type'), ] diff --git a/chrono/agendas/migrations/0123_user_check_type.py b/chrono/agendas/migrations/0123_user_check_type.py index 0955ed47..b1228248 100644 --- a/chrono/agendas/migrations/0123_user_check_type.py +++ b/chrono/agendas/migrations/0123_user_check_type.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0122_user_check_type'), ] diff --git a/chrono/agendas/migrations/0124_check_type_disabled.py b/chrono/agendas/migrations/0124_check_type_disabled.py index de67e12a..4d44720c 100644 --- a/chrono/agendas/migrations/0124_check_type_disabled.py +++ b/chrono/agendas/migrations/0124_check_type_disabled.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0123_user_check_type'), ] diff --git a/chrono/agendas/migrations/0125_auto_20220502_1134.py b/chrono/agendas/migrations/0125_auto_20220502_1134.py index d8f87e14..7746c8bd 100644 --- a/chrono/agendas/migrations/0125_auto_20220502_1134.py +++ b/chrono/agendas/migrations/0125_auto_20220502_1134.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0124_check_type_disabled'), ] diff --git a/chrono/agendas/migrations/0126_pricing.py b/chrono/agendas/migrations/0126_pricing.py index 26ed40ad..3f4eafff 100644 --- a/chrono/agendas/migrations/0126_pricing.py +++ b/chrono/agendas/migrations/0126_pricing.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0125_auto_20220502_1134'), ] diff --git a/chrono/agendas/migrations/0127_remove_pricing_models.py b/chrono/agendas/migrations/0127_remove_pricing_models.py index c75ecf5b..5ef558c6 100644 --- a/chrono/agendas/migrations/0127_remove_pricing_models.py +++ b/chrono/agendas/migrations/0127_remove_pricing_models.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0126_pricing'), ] diff --git a/chrono/agendas/migrations/0128_event_date_range_constraint.py b/chrono/agendas/migrations/0128_event_date_range_constraint.py index 164ed51b..bd5c6465 100644 --- a/chrono/agendas/migrations/0128_event_date_range_constraint.py +++ b/chrono/agendas/migrations/0128_event_date_range_constraint.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0127_remove_pricing_models'), ] diff --git a/chrono/agendas/migrations/0129_event_date_range_constraint.py b/chrono/agendas/migrations/0129_event_date_range_constraint.py index 10793168..4a6f41fe 100644 --- a/chrono/agendas/migrations/0129_event_date_range_constraint.py +++ b/chrono/agendas/migrations/0129_event_date_range_constraint.py @@ -38,7 +38,6 @@ WHERE class Migration(migrations.Migration): - dependencies = [ ('agendas', '0128_event_date_range_constraint'), ] diff --git a/chrono/agendas/migrations/0130_event_date_range_constraint.py b/chrono/agendas/migrations/0130_event_date_range_constraint.py index 81a81f8e..bcf7f3c9 100644 --- a/chrono/agendas/migrations/0130_event_date_range_constraint.py +++ b/chrono/agendas/migrations/0130_event_date_range_constraint.py @@ -12,7 +12,6 @@ EXCLUDE USING GIST(desk_id WITH =, tstzrange(start_datetime, _end_datetime) WITH class Migration(migrations.Migration): - dependencies = [ ('agendas', '0129_event_date_range_constraint'), ] diff --git a/chrono/agendas/migrations/0131_sharedcustodysettings.py b/chrono/agendas/migrations/0131_sharedcustodysettings.py index 0ae519d8..add2de8c 100644 --- a/chrono/agendas/migrations/0131_sharedcustodysettings.py +++ b/chrono/agendas/migrations/0131_sharedcustodysettings.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('auth', '0011_update_proxy_permissions'), ('agendas', '0130_event_date_range_constraint'), diff --git a/chrono/agendas/migrations/0132_sharedcustodysettings_holidays_calendar.py b/chrono/agendas/migrations/0132_sharedcustodysettings_holidays_calendar.py index 2e94ce82..fa2e1e47 100644 --- a/chrono/agendas/migrations/0132_sharedcustodysettings_holidays_calendar.py +++ b/chrono/agendas/migrations/0132_sharedcustodysettings_holidays_calendar.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0131_sharedcustodysettings'), ] diff --git a/chrono/agendas/migrations/0133_auto_20220628_1600.py b/chrono/agendas/migrations/0133_auto_20220628_1600.py index 848d9d9c..90ece344 100644 --- a/chrono/agendas/migrations/0133_auto_20220628_1600.py +++ b/chrono/agendas/migrations/0133_auto_20220628_1600.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0132_sharedcustodysettings_holidays_calendar'), ] diff --git a/chrono/agendas/migrations/0134_remove_check_type.py b/chrono/agendas/migrations/0134_remove_check_type.py index 55fee04b..220b5541 100644 --- a/chrono/agendas/migrations/0134_remove_check_type.py +++ b/chrono/agendas/migrations/0134_remove_check_type.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0133_auto_20220628_1600'), ] diff --git a/chrono/agendas/migrations/0135_remove_check_type.py b/chrono/agendas/migrations/0135_remove_check_type.py index b5af334d..784d7753 100644 --- a/chrono/agendas/migrations/0135_remove_check_type.py +++ b/chrono/agendas/migrations/0135_remove_check_type.py @@ -36,7 +36,6 @@ def backwards(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0134_remove_check_type'), ] diff --git a/chrono/agendas/migrations/0136_remove_check_type.py b/chrono/agendas/migrations/0136_remove_check_type.py index ea7e9334..c997ac9e 100644 --- a/chrono/agendas/migrations/0136_remove_check_type.py +++ b/chrono/agendas/migrations/0136_remove_check_type.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0135_remove_check_type'), ] diff --git a/chrono/agendas/migrations/0137_remove_check_type.py b/chrono/agendas/migrations/0137_remove_check_type.py index c120c3f4..532af5b8 100644 --- a/chrono/agendas/migrations/0137_remove_check_type.py +++ b/chrono/agendas/migrations/0137_remove_check_type.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('agendas', '0136_remove_check_type'), ] diff --git a/chrono/agendas/migrations/0138_sharedcustodyagenda_date_start.py b/chrono/agendas/migrations/0138_sharedcustodyagenda_date_start.py index 371c346a..467a9a61 100644 --- a/chrono/agendas/migrations/0138_sharedcustodyagenda_date_start.py +++ b/chrono/agendas/migrations/0138_sharedcustodyagenda_date_start.py @@ -6,7 +6,6 @@ import chrono.utils.timezone class Migration(migrations.Migration): - dependencies = [ ('agendas', '0137_remove_check_type'), ] diff --git a/chrono/agendas/migrations/0139_auto_20220726_1017.py b/chrono/agendas/migrations/0139_auto_20220726_1017.py index 83f24ef1..c025bbd2 100644 --- a/chrono/agendas/migrations/0139_auto_20220726_1017.py +++ b/chrono/agendas/migrations/0139_auto_20220726_1017.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0138_sharedcustodyagenda_date_start'), ] diff --git a/chrono/agendas/migrations/0140_add_timeperiod_date_field.py b/chrono/agendas/migrations/0140_add_timeperiod_date_field.py index a4c42862..d6df386a 100644 --- a/chrono/agendas/migrations/0140_add_timeperiod_date_field.py +++ b/chrono/agendas/migrations/0140_add_timeperiod_date_field.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0139_auto_20220726_1017'), ] diff --git a/chrono/agendas/migrations/0141_shared_custody_add_child_field.py b/chrono/agendas/migrations/0141_shared_custody_add_child_field.py index 01559eb4..7a9fa249 100644 --- a/chrono/agendas/migrations/0141_shared_custody_add_child_field.py +++ b/chrono/agendas/migrations/0141_shared_custody_add_child_field.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0140_add_timeperiod_date_field'), ] diff --git a/chrono/agendas/migrations/0142_shared_custody_populate_child_field.py b/chrono/agendas/migrations/0142_shared_custody_populate_child_field.py index eaceac85..7600ec8a 100644 --- a/chrono/agendas/migrations/0142_shared_custody_populate_child_field.py +++ b/chrono/agendas/migrations/0142_shared_custody_populate_child_field.py @@ -16,7 +16,6 @@ def populate_child_column(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('agendas', '0141_shared_custody_add_child_field'), ] diff --git a/chrono/agendas/migrations/0143_shared_custody_remove_children_field.py b/chrono/agendas/migrations/0143_shared_custody_remove_children_field.py index 77128d63..d3758d39 100644 --- a/chrono/agendas/migrations/0143_shared_custody_remove_children_field.py +++ b/chrono/agendas/migrations/0143_shared_custody_remove_children_field.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0142_shared_custody_populate_child_field'), ] diff --git a/chrono/agendas/migrations/0144_sharedcustodyagenda_date_end.py b/chrono/agendas/migrations/0144_sharedcustodyagenda_date_end.py index 0c0aaf0e..05b222a7 100644 --- a/chrono/agendas/migrations/0144_sharedcustodyagenda_date_end.py +++ b/chrono/agendas/migrations/0144_sharedcustodyagenda_date_end.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0143_shared_custody_remove_children_field'), ] diff --git a/chrono/agendas/migrations/0145_user_phone_number.py b/chrono/agendas/migrations/0145_user_phone_number.py index 23ebd535..45d49502 100644 --- a/chrono/agendas/migrations/0145_user_phone_number.py +++ b/chrono/agendas/migrations/0145_user_phone_number.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0144_sharedcustodyagenda_date_end'), ] diff --git a/chrono/agendas/migrations/0146_event_bigautofield.py b/chrono/agendas/migrations/0146_event_bigautofield.py index bfa86863..49dfe5b7 100644 --- a/chrono/agendas/migrations/0146_event_bigautofield.py +++ b/chrono/agendas/migrations/0146_event_bigautofield.py @@ -21,7 +21,6 @@ with open( class Migration(migrations.Migration): - dependencies = [ ('agendas', '0145_user_phone_number'), ] diff --git a/chrono/agendas/migrations/0147_check_future_events.py b/chrono/agendas/migrations/0147_check_future_events.py index 494090c7..9a9f59f7 100644 --- a/chrono/agendas/migrations/0147_check_future_events.py +++ b/chrono/agendas/migrations/0147_check_future_events.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0146_event_bigautofield'), ] diff --git a/chrono/agendas/migrations/0148_agenda_minimal_booking_time.py b/chrono/agendas/migrations/0148_agenda_minimal_booking_time.py index 22377e0c..fedd0189 100644 --- a/chrono/agendas/migrations/0148_agenda_minimal_booking_time.py +++ b/chrono/agendas/migrations/0148_agenda_minimal_booking_time.py @@ -6,7 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('agendas', '0147_check_future_events'), ] diff --git a/chrono/utils/db.py b/chrono/utils/db.py index bbf3c83a..004778ce 100644 --- a/chrono/utils/db.py +++ b/chrono/utils/db.py @@ -32,7 +32,6 @@ class ArraySubquery(Subquery): class EnsureJsonbType(Operation): - reversible = True def __init__(self, model_name, field_name): diff --git a/tests/api/fillslot/test_all.py b/tests/api/fillslot/test_all.py index d816b6cb..78b6fa18 100644 --- a/tests/api/fillslot/test_all.py +++ b/tests/api/fillslot/test_all.py @@ -1524,7 +1524,7 @@ def test_multiple_booking_api_fillslots(app, user): assert 'ics_url' in resp.json['api'] resp_events = resp.json['events'] assert len(resp_events) == len(events) - for (e, resp_e) in zip(events, resp_events): + for e, resp_e in zip(events, resp_events): assert e.slug == resp_e['slug'] assert e.description == resp_e['description'] assert str(e) == resp_e['text'] diff --git a/tests/test_requests.py b/tests/test_requests.py index 5b5b923e..157112e6 100644 --- a/tests/test_requests.py +++ b/tests/test_requests.py @@ -68,7 +68,6 @@ def test_auto_sign(): def test_sign_user(): remote_service = {'url': 'http://example.org', 'secret': 'secret', 'orig': 'myself'} with mock.patch('chrono.utils.requests_wrapper.RequestsSession.send') as send: - user = MockUser(samlized=True) requests.get('/foo/bar/', remote_service=remote_service, user=user) @@ -107,7 +106,6 @@ def test_sign_user(): def test_sign_anonymous_user(): remote_service = {'url': 'http://example.org', 'secret': 'secret', 'orig': 'myself'} with mock.patch('chrono.utils.requests_wrapper.RequestsSession.send') as send: - user = AnonymousUser() requests.get('/foo/bar/', remote_service=remote_service, user=user) -- 2.39.2 From 34309253eddc15f17a280656a3ffec072e79731a Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 15 Mar 2023 14:13:55 +0100 Subject: [PATCH 5/7] misc: bump djhtml version (#75442) --- .pre-commit-config.yaml | 2 +- .../chrono/manager_agenda_event_fragment.html | 16 ++++++++-------- .../manager_agenda_notifications_form.html | 4 ++-- .../manager_event_check_booking_fragment.html | 4 ++-- .../templates/chrono/manager_event_form.html | 2 +- .../chrono/manager_meetings_agenda_day_view.html | 6 +++--- .../chrono/manager_meetings_agenda_settings.html | 14 +++++++------- .../chrono/manager_resource_day_view.html | 2 +- .../chrono/manager_time_period_form.html | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4cf4df86..0bcd848d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - id: django-upgrade args: ['--target-version', '3.2'] - repo: https://github.com/rtts/djhtml - rev: 'v1.5.2' + rev: '3.0.5' hooks: - id: djhtml args: ['--tabwidth', '2'] diff --git a/chrono/manager/templates/chrono/manager_agenda_event_fragment.html b/chrono/manager/templates/chrono/manager_agenda_event_fragment.html index ebe76c4d..a963cbe6 100644 --- a/chrono/manager/templates/chrono/manager_agenda_event_fragment.html +++ b/chrono/manager/templates/chrono/manager_agenda_event_fragment.html @@ -1,13 +1,13 @@ {% load i18n %}
  • {% if view_mode == 'settings_view' %} diff --git a/chrono/manager/templates/chrono/manager_agenda_notifications_form.html b/chrono/manager/templates/chrono/manager_agenda_notifications_form.html index bff2b70c..5ed72e88 100644 --- a/chrono/manager/templates/chrono/manager_agenda_notifications_form.html +++ b/chrono/manager/templates/chrono/manager_agenda_notifications_form.html @@ -25,9 +25,9 @@ role_field_id = $(this).attr('id') email_field_id = '#' + role_field_id + '_emails' if ($(this).val() == 'use-email-field') - $(email_field_id).parent('p').show(); + $(email_field_id).parent('p').show(); else - $(email_field_id).parent('p').hide(); + $(email_field_id).parent('p').hide(); }); $('select').trigger('change'); diff --git a/chrono/manager/templates/chrono/manager_event_check_booking_fragment.html b/chrono/manager/templates/chrono/manager_event_check_booking_fragment.html index 2ad1d270..b3a114c3 100644 --- a/chrono/manager/templates/chrono/manager_event_check_booking_fragment.html +++ b/chrono/manager/templates/chrono/manager_event_check_booking_fragment.html @@ -39,7 +39,7 @@ {% endif %} {% csrf_token %} {% if booking.presence_form.check_type.field.choices.1 %}{{ booking.presence_form.check_type }}{% endif %}