Merge remote-tracking branch 'origin/master' into dev

cortex-lab · Apr 15, 2024 · d5a428f · d5a428f
2 parents a3ccd74 + 0ec10ae
commit d5a428f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 4 deletions.
diff --git a/alyx/alyx/settings_lab_template.py b/alyx/alyx/settings_lab_template.py
@@ -3,7 +3,7 @@
 # ALYX-SPECIFIC
 ALLOWED_HOSTS = ['localhost', '127.0.0.1']
 LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'GB'
+TIME_ZONE = 'Europe/London'
 GLOBUS_CLIENT_ID = '525cc543-8ccb-4d11-8036-af332da5eafd'
 SUBJECT_REQUEST_EMAIL_FROM = '[email protected]'
 DEFAULT_SOURCE = 'IBL'

diff --git a/alyx/data/migrations/0020_alter_datarepository_timezone.py b/alyx/data/migrations/0020_alter_datarepository_timezone.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0 on 2024-03-26 15:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("data", "0019_dataset_qc"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="datarepository",
+            name="timezone",
+            field=models.CharField(
+                blank=True,
+                default="Europe/London",
+                help_text="Timezone of the server (see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)",
+                max_length=64,
+            ),
+        ),
+    ]
diff --git a/alyx/misc/migrations/0010_alter_lab_timezone.py b/alyx/misc/migrations/0010_alter_lab_timezone.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0 on 2024-03-26 15:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("misc", "0009_auto_20211122_1535"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="lab",
+            name="timezone",
+            field=models.CharField(
+                blank=True,
+                default="Europe/London",
+                help_text="Timezone of the server (see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)",
+                max_length=64,
+            ),
+        ),
+    ]
diff --git a/alyx/static/ref_weighings_female.csv b/alyx/static/ref_weighings_female.csv
diff --git a/alyx/static/ref_weighings_female.csv b/alyx/static/ref_weighings_female.csv
@@ -0,0 +1 @@
+/home/runner/work/alyx/alyx/alyx/actions/static/ref_weighings_female.csv
diff --git a/alyx/static/ref_weighings_male.csv b/alyx/static/ref_weighings_male.csv
diff --git a/alyx/static/ref_weighings_male.csv b/alyx/static/ref_weighings_male.csv
@@ -0,0 +1 @@
+/home/runner/work/alyx/alyx/alyx/actions/static/ref_weighings_male.csv
diff --git a/requirements_frozen.txt b/requirements_frozen.txt
@@ -3,7 +3,7 @@ backports.zoneinfo==0.2.1
 boto3==1.34.84
 botocore==1.34.84
 certifi==2024.2.2
-cffi==1.16.0
+ffi==1.16.0
 charset-normalizer==3.3.2
 click==8.1.7
 colorlog==6.8.2