Merge branch 'develop' into pipeline-skip-run-steps

spacetelescope · Jul 25, 2023 · 1160e5d · 1160e5d
2 parents 9f5f05d + 4d858e7
commit 1160e5d
Show file tree

Hide file tree

Showing 32 changed files with 1,857 additions and 611 deletions.
diff --git a/README.md b/README.md
@@ -86,13 +86,13 @@ source activate base/root
 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_8.yml
+conda env create -f environment_python_3_9.yml
 ```
 
 or
 
 ```
-conda env create -f environment_python_3_9.yml
+conda env create -f environment_python_3_10.yml
 ```
 
 ### Configuration File

diff --git a/environment_python_3.10.yml b/environment_python_3.10.yml
@@ -22,48 +22,48 @@ channels:
   - defaults
 
 dependencies:
-  - astropy=5.2.1
+  - astropy=5.2.2
   - bokeh=2.4.3
-  - beautifulsoup4=4.11.2
+  - beautifulsoup4=4.12.2
   - celery=5.2.7
-  - cryptography=39.0.1
-  - django=4.1.7
-  - flake8=6.0.0
+  - cryptography=40.0.2
+  - django=4.2.1
   - inflection=0.5.1
-  - ipython=8.10.0
+  - ipython=8.13.2
   - jinja2=3.1.2
   - jsonschema=4.17.3
   - matplotlib=3.7.0
-  - nodejs=18.12.1
-  - numpy=1.24.2
+  - nodejs=18.15.0
+  - numpy=1.24.3
   - numpydoc=1.5.0
-  - pandas=2.0.0
-  - pip=23.0
+  - pandas=2.0.1
+  - pip=23.1.2
   - postgresql=15.2
   - psycopg2=2.9.3
-  - pytest=7.2.1
+  - pytest=7.3.1
   - pytest-cov=4.0.0
   - pytest-mock=3.10.0
   - python=3.10.9
   - pyyaml=6.0
   - redis
+  - ruff=0.0.269
   - scipy=1.9.3
-  - setuptools=67.3.1
-  - sphinx=6.1.3
+  - setuptools=67.7.2
+  - sphinx=6.2.1
   - sphinx_rtd_theme=1.2.0
-  - sqlalchemy=2.0.8
+  - sqlalchemy=2.0.15
   - twine=4.0.2
   - wtforms=3.0.1
 
   - pip:
     - astroquery==0.4.6
-    - bandit==1.7.4
-    - jwst==1.10.0
+    - bandit==1.7.5
+    - jwst==1.10.2
     - pysiaf==0.19.1
     - pysqlite3==0.5.0
-    - pyvo==1.4
-    - redis==4.5.1
-    - selenium==4.8.0
+    - pyvo==1.4.1
+    - redis==4.5.5
+    - selenium==4.9.1
     - stdatamodels==1.3.1
     - stsci_rtd_theme==1.0.0
     - vine==5.0.0

diff --git a/environment_python_3.9.yml b/environment_python_3.9.yml
@@ -22,48 +22,48 @@ channels:
   - defaults
 
 dependencies:
-  - astropy=5.2.1
+  - astropy=5.2.2
   - bokeh=2.4.3
-  - beautifulsoup4=4.11.2
+  - beautifulsoup4=4.12.2
   - celery=5.2.7
-  - cryptography=39.0.1
-  - django=4.1.7
-  - flake8=6.0.0
+  - cryptography=40.0.2
+  - django=4.2.1
   - inflection=0.5.1
-  - ipython=8.10.0
+  - ipython=8.13.2
   - jinja2=3.1.2
   - jsonschema=4.17.3
   - matplotlib=3.7.0
-  - nodejs=18.12.1
-  - numpy=1.24.2
+  - nodejs=18.15.0
+  - numpy=1.24.3
   - numpydoc=1.5.0
-  - pandas=2.0.0
-  - pip=23.0
+  - pandas=2.0.1
+  - pip=23.1.2
   - postgresql=15.2
   - psycopg2=2.9.3
-  - pytest=7.2.1
+  - pytest=7.3.1
   - pytest-cov=4.0.0
   - pytest-mock=3.10.0
   - python=3.9.16
   - pyyaml=6.0
   - redis
+  - ruff=0.0.269
   - scipy=1.9.3
-  - setuptools=67.3.1
-  - sphinx=6.1.3
+  - setuptools=67.7.2
+  - sphinx=6.2.1
   - sphinx_rtd_theme=1.2.0
-  - sqlalchemy=2.0.8
+  - sqlalchemy=2.0.15
   - twine=4.0.2
   - wtforms=3.0.1
 
   - pip:
     - astroquery==0.4.6
-    - bandit==1.7.4
-    - jwst==1.10.0
+    - bandit==1.7.5
+    - jwst==1.10.2
     - pysiaf==0.19.1
     - pysqlite3==0.5.0
-    - pyvo==1.4
-    - redis==4.5.1
-    - selenium==4.8.0
+    - pyvo==1.4.1
+    - redis==4.5.5
+    - selenium==4.9.1
     - stdatamodels==1.3.1
     - stsci_rtd_theme==1.0.0
     - vine==5.0.0

diff --git a/jwql/example_config.json b/jwql/example_config.json
@@ -10,6 +10,14 @@
         "host" : "",
         "port" : ""
     },
+    "django_database" : {
+        "ENGINE" : "",
+        "NAME" : "",
+        "USER" : "",
+        "PASSWORD" : "",
+        "HOST" : "",
+        "PORT" : ""
+    },
     "jwql_dir" : "",
     "jwql_version": "",
     "server_type": "",