Merge branch 'develop' into dependabot/pip/cryptography-41.0.4

spacetelescope · Sep 29, 2023 · 9894eb4 · 9894eb4
2 parents b85a1b0 + 6f1e72f
commit 9894eb4
Show file tree

Hide file tree

Showing 12 changed files with 410 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -83,16 +83,16 @@ source activate base/root
 
 **Note:** If you have added a step activating conda to your default terminal/shell (e.g. the `.bashrc`, `.zshrc`, or `.profile` file) then you don't need to do the above step.
 
-Lastly, create the `jwql` environment via one of the `environment.yml` files (currently `environment_python_3_9.yml`, for python 3.9, and `environment_python_3.10.yml`, for python 3.10, are supported by `jwql`):
+Lastly, create the `jwql` environment via one of the `environment.yml` files (currently `environment_python_3.9.yml`, for python 3.9, and `environment_python_3.10.yml`, for python 3.10, are supported by `jwql`):
 
 ```
-conda env create -f environment_python_3_9.yml
+conda env create -f environment_python_3.9.yml
 ```
 
 or
 
 ```
-conda env create -f environment_python_3_10.yml
+conda env create -f environment_python_3.10.yml
 ```
 
 ### Configuration File

diff --git a/jwql/website/apps/jwql/migrations/0001_initial.py b/jwql/website/apps/jwql/migrations/0001_initial.py
@@ -0,0 +1,45 @@
+# Generated by Django 3.1.7 on 2022-09-09 17:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ImageData',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('inst', models.CharField(choices=[('FGS', 'FGS'), ('MIRI', 'MIRI'), ('NIRCam', 'NIRCam'), ('NIRISS', 'NIRISS'), ('NIRSpec', 'NIRSpec')], default=None, max_length=7, verbose_name='instrument')),
+                ('pub_date', models.DateTimeField(verbose_name='date published')),
+                ('filepath', models.FilePathField(path='/user/lchambers/jwql/')),
+            ],
+            options={
+                'verbose_name_plural': 'image data',
+                'db_table': 'imagedata',
+            },
+        ),
+        migrations.CreateModel(
+            name='InstrumentFilterHandler',
+            fields=[
+                ('instrument', models.CharField(max_length=10, primary_key=True, serialize=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ThumbnailFilterInfo',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('observation', models.PositiveIntegerField()),
+                ('proposal', models.PositiveIntegerField()),
+                ('root_name', models.CharField(max_length=300)),
+                ('marked_viewed', models.BooleanField(default=False)),
+                ('inst_handler', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jwql.instrumentfilterhandler')),
+            ],
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/migrations/0002_auto_20220913_1525.py b/jwql/website/apps/jwql/migrations/0002_auto_20220913_1525.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1.7 on 2022-09-13 20:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='thumbnailfilterinfo',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='instrumentfilterhandler',
+            name='instrument',
+            field=models.TextField(max_length=10, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='thumbnailfilterinfo',
+            name='root_name',
+            field=models.TextField(max_length=300, primary_key=True, serialize=False),
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/migrations/0003_auto_20220921_0955.py b/jwql/website/apps/jwql/migrations/0003_auto_20220921_0955.py
@@ -0,0 +1,58 @@
+# Generated by Django 3.1.7 on 2022-09-21 14:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0002_auto_20220913_1525'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Archive',
+            fields=[
+                ('instrument', models.CharField(help_text='Instrument name', max_length=7, primary_key=True, serialize=False)),
+            ],
+            options={
+                'ordering': ['instrument'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Observation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('obsnum', models.CharField(help_text='Observation number, as a 3 digit string', max_length=3)),
+                ('number_of_files', models.IntegerField(default=0, help_text='Number of files in the proposal')),
+                ('obsstart', models.FloatField(default=0.0, help_text='Time of the beginning of the observation in MJD')),
+                ('obsend', models.FloatField(default=0.0, help_text='Time of the end of the observation in MJD')),
+                ('exptypes', models.CharField(default='', help_text='Comma-separated list of exposure types', max_length=100)),
+            ],
+            options={
+                'ordering': ['-obsnum'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Proposal',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('prop_id', models.CharField(help_text='5-digit proposal ID string', max_length=5)),
+                ('thumbnail_path', models.CharField(default='', help_text='Path to the proposal thumbnail', max_length=100)),
+                ('archive', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jwql.archive')),
+            ],
+            options={
+                'ordering': ['-prop_id'],
+                'unique_together': {('prop_id', 'archive')},
+            },
+        ),
+        migrations.DeleteModel(
+            name='ImageData',
+        ),
+        migrations.AddField(
+            model_name='observation',
+            name='proposal',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jwql.proposal'),
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/migrations/0004_auto_20220922_0911.py b/jwql/website/apps/jwql/migrations/0004_auto_20220922_0911.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.1.7 on 2022-09-22 14:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0003_auto_20220921_0955'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='thumbnailfilterinfo',
+            name='obsnum',
+            field=models.CharField(default=11, help_text='Observation number, as a 3 digit string', max_length=3),
+            preserve_default=False,
+        ),
+        migrations.CreateModel(
+            name='RootFileInfo',
+            fields=[
+                ('instrument', models.CharField(help_text='Instrument name', max_length=7)),
+                ('proposal', models.CharField(help_text='5-digit proposal ID string', max_length=5)),
+                ('root_name', models.TextField(max_length=300, primary_key=True, serialize=False)),
+                ('viewed', models.BooleanField(default=False)),
+                ('obsnum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jwql.observation')),
+            ],
+            options={
+                'ordering': ['-root_name'],
+            },
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/migrations/0005_auto_20220922_1422.py b/jwql/website/apps/jwql/migrations/0005_auto_20220922_1422.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.7 on 2022-09-22 19:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0004_auto_20220922_0911'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='thumbnailfilterinfo',
+            name='inst_handler',
+        ),
+        migrations.DeleteModel(
+            name='InstrumentFilterHandler',
+        ),
+        migrations.DeleteModel(
+            name='ThumbnailFilterInfo',
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/migrations/0006_auto_20230214_1624.py b/jwql/website/apps/jwql/migrations/0006_auto_20230214_1624.py
@@ -0,0 +1,95 @@
+# Generated by Django 3.1.7 on 2023-02-14 21:24
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0005_auto_20220922_1422'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Anomalies',
+            fields=[
+                ('root_file_info', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='jwql.rootfileinfo')),
+                ('cosmic_ray_shower', models.BooleanField(default=False)),
+                ('diffraction_spike', models.BooleanField(default=False)),
+                ('excessive_saturation', models.BooleanField(default=False)),
+                ('guidestar_failure', models.BooleanField(default=False)),
+                ('persistence', models.BooleanField(default=False)),
+                ('crosstalk', models.BooleanField(default=False)),
+                ('data_transfer_error', models.BooleanField(default=False)),
+                ('ghost', models.BooleanField(default=False)),
+                ('snowball', models.BooleanField(default=False)),
+                ('column_pull_up', models.BooleanField(default=False)),
+                ('column_pull_down', models.BooleanField(default=False)),
+                ('dominant_msa_leakage', models.BooleanField(default=False)),
+                ('dragons_breath', models.BooleanField(default=False)),
+                ('mrs_glow', models.BooleanField(default=False)),
+                ('mrs_zipper', models.BooleanField(default=False)),
+                ('internal_reflection', models.BooleanField(default=False)),
+                ('optical_short', models.BooleanField(default=False)),
+                ('row_pull_up', models.BooleanField(default=False)),
+                ('row_pull_down', models.BooleanField(default=False)),
+                ('lrs_contamination', models.BooleanField(default=False)),
+                ('tree_rings', models.BooleanField(default=False)),
+                ('scattered_light', models.BooleanField(default=False)),
+                ('claws', models.BooleanField(default=False)),
+                ('wisps', models.BooleanField(default=False)),
+                ('tilt_event', models.BooleanField(default=False)),
+                ('light_saber', models.BooleanField(default=False)),
+                ('other', models.BooleanField(default=False)),
+            ],
+            options={
+                'ordering': ['-root_file_info'],
+            },
+        ),
+        migrations.AddField(
+            model_name='proposal',
+            name='cat_type',
+            field=models.CharField(default='', help_text='Category Type', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='aperature',
+            field=models.CharField(default='', help_text='Aperature', max_length=40),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='detector',
+            field=models.CharField(default='', help_text='Detector', max_length=40),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='filter',
+            field=models.CharField(default='', help_text='Instrument name', max_length=7),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='grating',
+            field=models.CharField(default='', help_text='Grating', max_length=40),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='pupil',
+            field=models.CharField(default='', help_text='Pupil', max_length=40),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='read_patt',
+            field=models.CharField(default='', help_text='Read Pattern', max_length=40),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='read_patt_num',
+            field=models.IntegerField(default=0, help_text='Read Pattern Number'),
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='subarray',
+            field=models.CharField(default='', help_text='Subarray', max_length=40),
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/migrations/0007_auto_20230222_1157.py b/jwql/website/apps/jwql/migrations/0007_auto_20230222_1157.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.1.7 on 2023-02-22 16:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0006_auto_20230214_1624'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='rootfileinfo',
+            name='aperature',
+        ),
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='aperture',
+            field=models.CharField(default='', help_text='Aperture', max_length=40),
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/migrations/0008_rootfileinfo_exp_type.py b/jwql/website/apps/jwql/migrations/0008_rootfileinfo_exp_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.7 on 2023-02-22 17:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0007_auto_20230222_1157'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rootfileinfo',
+            name='exp_type',
+            field=models.CharField(default='', help_text='Exposure Type', max_length=40),
+        ),
+    ]