From 166e8a3dbc5e60df0a692df29109076b77abb3ef Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 22 Mar 2024 16:00:47 +0000 Subject: [PATCH 1/5] GitHub Actions generated requirements_frozen.txt --- alyx/static/ref_weighings_female.csv | 2 +- alyx/static/ref_weighings_male.csv | 2 +- requirements_frozen.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 120000 alyx/static/ref_weighings_female.csv mode change 100644 => 120000 alyx/static/ref_weighings_male.csv diff --git a/alyx/static/ref_weighings_female.csv b/alyx/static/ref_weighings_female.csv deleted file mode 100644 index 5b2e02cd0..000000000 --- a/alyx/static/ref_weighings_female.csv +++ /dev/null @@ -1 +0,0 @@ -4,14.10,1.80 5,16.90,1.20 6,17.50,1.00 7,18.20,1.10 8,18.70,1.20 9,19.30,1.20 10,19.80,1.30 11,20.20,1.40 12,20.70,1.40 13,21.70,1.50 14,22.00,1.60 15,22.30,1.70 16,22.60,1.80 17,22.60,2.00 18,23.00,2.10 19,23.50,2.30 20,23.60,2.30 21,23.60,2.30 22,23.60,2.30 23,23.60,2.30 24,23.60,2.30 25,23.60,2.30 26,23.60,2.30 27,23.60,2.30 28,23.60,2.30 29,23.60,2.30 30,23.60,2.30 31,23.60,2.30 32,23.60,2.30 33,23.60,2.30 34,23.60,2.30 35,23.60,2.30 36,23.60,2.30 37,23.60,2.30 38,23.60,2.30 39,23.60,2.30 40,23.60,2.30 41,23.60,2.30 42,23.60,2.30 43,23.60,2.30 44,23.60,2.30 45,23.60,2.30 46,23.60,2.30 47,23.60,2.30 48,23.60,2.30 49,23.60,2.30 50,23.60,2.30 51,23.60,2.30 52,23.60,2.30 53,23.60,2.30 54,23.60,2.30 55,23.60,2.30 56,23.60,2.30 57,23.60,2.30 58,23.60,2.30 59,23.60,2.30 60,23.60,2.30 61,23.60,2.30 62,23.60,2.30 63,23.60,2.30 64,23.60,2.30 65,23.60,2.30 66,23.60,2.30 67,23.60,2.30 68,23.60,2.30 69,23.60,2.30 70,23.60,2.30 71,23.60,2.30 72,23.60,2.30 73,23.60,2.30 74,23.60,2.30 75,23.60,2.30 76,23.60,2.30 77,23.60,2.30 78,23.60,2.30 79,23.60,2.30 80,23.60,2.30 81,23.60,2.30 82,23.60,2.30 83,23.60,2.30 84,23.60,2.30 85,23.60,2.30 86,23.60,2.30 87,23.60,2.30 88,23.60,2.30 89,23.60,2.30 90,23.60,2.30 91,23.60,2.30 92,23.60,2.30 93,23.60,2.30 94,23.60,2.30 95,23.60,2.30 96,23.60,2.30 \ No newline at end of file diff --git a/alyx/static/ref_weighings_female.csv b/alyx/static/ref_weighings_female.csv new file mode 120000 index 000000000..532baa00c --- /dev/null +++ b/alyx/static/ref_weighings_female.csv @@ -0,0 +1 @@ +/home/runner/work/alyx/alyx/alyx/actions/static/ref_weighings_female.csv \ No newline at end of file diff --git a/alyx/static/ref_weighings_male.csv b/alyx/static/ref_weighings_male.csv deleted file mode 100644 index 479d8021b..000000000 --- a/alyx/static/ref_weighings_male.csv +++ /dev/null @@ -1 +0,0 @@ -4,15.70,2.20 5,19.40,1.80 6,21.10,1.50 7,22.90,1.50 8,24.00,1.50 9,25.00,1.60 10,25.60,1.70 11,26.70,1.70 12,27.70,1.70 13,28.40,1.90 14,29.10,1.90 15,29.70,2.20 16,30.10,2.10 17,30.70,2.20 18,31.10,2.30 19,31.40,2.40 20,31.80,2.50 21,31.80,2.50 22,31.80,2.50 23,31.80,2.50 24,31.80,2.50 25,31.80,2.50 26,31.80,2.50 27,31.80,2.50 28,31.80,2.50 29,31.80,2.50 30,31.80,2.50 31,31.80,2.50 32,31.80,2.50 33,31.80,2.50 34,31.80,2.50 35,31.80,2.50 36,31.80,2.50 37,31.80,2.50 38,31.80,2.50 39,31.80,2.50 40,31.80,2.50 41,31.80,2.50 42,31.80,2.50 43,31.80,2.50 44,31.80,2.50 45,31.80,2.50 46,31.80,2.50 47,31.80,2.50 48,31.80,2.50 49,31.80,2.50 50,31.80,2.50 51,31.80,2.50 52,31.80,2.50 53,31.80,2.50 54,31.80,2.50 55,31.80,2.50 56,31.80,2.50 57,31.80,2.50 58,31.80,2.50 59,31.80,2.50 60,31.80,2.50 61,31.80,2.50 62,31.80,2.50 63,31.80,2.50 64,31.80,2.50 65,31.80,2.50 66,31.80,2.50 67,31.80,2.50 68,31.80,2.50 69,31.80,2.50 70,31.80,2.50 71,31.80,2.50 72,31.80,2.50 73,31.80,2.50 74,31.80,2.50 75,31.80,2.50 76,31.80,2.50 77,31.80,2.50 78,31.80,2.50 79,31.80,2.50 80,31.80,2.50 81,31.80,2.50 82,31.80,2.50 83,31.80,2.50 84,31.80,2.50 85,31.80,2.50 86,31.80,2.50 87,31.80,2.50 88,31.80,2.50 89,31.80,2.50 90,31.80,2.50 91,31.80,2.50 92,31.80,2.50 93,31.80,2.50 94,31.80,2.50 95,31.80,2.50 96,31.80,2.50 97,31.80,2.50 98,31.80,2.50 99,31.80,2.50 100,31.80,2.50 101,31.80,2.50 102,31.80,2.50 103,31.80,2.50 104,31.80,2.50 105,31.80,2.50 106,31.80,2.50 107,31.80,2.50 108,31.80,2.50 109,31.80,2.50 110,31.80,2.50 111,31.80,2.50 112,31.80,2.50 113,31.80,2.50 114,31.80,2.50 115,31.80,2.50 116,31.80,2.50 117,31.80,2.50 118,31.80,2.50 119,31.80,2.50 120,31.80,2.50 121,31.80,2.50 122,31.80,2.50 123,31.80,2.50 124,31.80,2.50 125,31.80,2.50 126,31.80,2.50 127,31.80,2.50 128,31.80,2.50 129,31.80,2.50 130,31.80,2.50 131,31.80,2.50 132,31.80,2.50 133,31.80,2.50 134,31.80,2.50 135,31.80,2.50 \ No newline at end of file diff --git a/alyx/static/ref_weighings_male.csv b/alyx/static/ref_weighings_male.csv new file mode 120000 index 000000000..1b6ae6d32 --- /dev/null +++ b/alyx/static/ref_weighings_male.csv @@ -0,0 +1 @@ +/home/runner/work/alyx/alyx/alyx/actions/static/ref_weighings_male.csv \ No newline at end of file diff --git a/requirements_frozen.txt b/requirements_frozen.txt index 1fa65296c..947076f37 100644 --- a/requirements_frozen.txt +++ b/requirements_frozen.txt @@ -1,4 +1,4 @@ -asgiref==3.8.0 +asgiref==3.8.1 backports.zoneinfo==0.2.1 boto3==1.34.68 botocore==1.34.68 @@ -28,7 +28,7 @@ django-reversion==5.0.12 django-storages==1.14.2 django-structlog==8.0.0 django-test-without-migrations==0.6 -djangorestframework==3.15.0 +djangorestframework==3.15.1 docopt==0.6.2 docutils==0.20.1 drfdocs==0.0.11 From 7da1e67f4df4a6824acde1a77874a51c8124804a Mon Sep 17 00:00:00 2001 From: olivier Date: Tue, 26 Mar 2024 15:27:50 +0000 Subject: [PATCH 2/5] set the timezone to a Django 5 compatible value --- alyx/alyx/settings_lab_template.py | 2 +- .../0020_alter_datarepository_timezone.py | 23 +++++++++++++++++++ .../migrations/0010_alter_lab_timezone.py | 23 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 alyx/data/migrations/0020_alter_datarepository_timezone.py create mode 100644 alyx/misc/migrations/0010_alter_lab_timezone.py diff --git a/alyx/alyx/settings_lab_template.py b/alyx/alyx/settings_lab_template.py index 8d3bfc494..4f8ac7a81 100644 --- 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 = 'alyx@internationalbrainlab.org' DEFAULT_SOURCE = 'IBL' diff --git a/alyx/data/migrations/0020_alter_datarepository_timezone.py b/alyx/data/migrations/0020_alter_datarepository_timezone.py new file mode 100644 index 000000000..3dd45bccc --- /dev/null +++ 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 new file mode 100644 index 000000000..3d789c584 --- /dev/null +++ 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, + ), + ), + ] From 5afa531e95b84280325a243b52bfb8bc17b8fa30 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 26 Mar 2024 15:34:36 +0000 Subject: [PATCH 3/5] GitHub Actions generated requirements_frozen.txt --- requirements_frozen.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements_frozen.txt b/requirements_frozen.txt index 947076f37..b4dfc7f14 100644 --- a/requirements_frozen.txt +++ b/requirements_frozen.txt @@ -1,7 +1,7 @@ asgiref==3.8.1 backports.zoneinfo==0.2.1 -boto3==1.34.68 -botocore==1.34.68 +boto3==1.34.70 +botocore==1.34.70 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 @@ -52,7 +52,7 @@ matplotlib==3.7.5 mccabe==0.7.0 numba==0.58.1 numpy==1.24.4 -ONE-api==2.7rc2 +ONE-api==2.7.0 packaging==24.0 pandas==2.0.3 pillow==10.2.0 From 510e29ea15e5da59be734c788b8f091941b6fba1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 04:07:31 +0000 Subject: [PATCH 4/5] Bump idna from 3.6 to 3.7 Bumps [idna](https://github.com/kjd/idna) from 3.6 to 3.7. - [Release notes](https://github.com/kjd/idna/releases) - [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst) - [Commits](https://github.com/kjd/idna/compare/v3.6...v3.7) --- updated-dependencies: - dependency-name: idna dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements_frozen.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_frozen.txt b/requirements_frozen.txt index b4dfc7f14..58c595d15 100644 --- a/requirements_frozen.txt +++ b/requirements_frozen.txt @@ -37,7 +37,7 @@ fonttools==4.50.0 globus-cli==3.26.0 globus-sdk==3.37.0 iblutil==1.8.0 -idna==3.6 +idna==3.7 importlib_metadata==7.1.0 importlib_resources==6.4.0 itypes==1.2.0 From 0ec10ae482f051222676dc5bf09bac634faddefe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:12:39 +0000 Subject: [PATCH 5/5] Bump pillow from 10.2.0 to 10.3.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/10.2.0...10.3.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements_frozen.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_frozen.txt b/requirements_frozen.txt index 58c595d15..3fefe9549 100644 --- a/requirements_frozen.txt +++ b/requirements_frozen.txt @@ -55,7 +55,7 @@ numpy==1.24.4 ONE-api==2.7.0 packaging==24.0 pandas==2.0.3 -pillow==10.2.0 +pillow==10.3.0 psycopg2-binary==2.9.9 pyarrow==15.0.2 pycodestyle==2.11.1