From 906dcf666651e32911559408bd8c36957c1209ad Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 1 Aug 2024 09:27:47 -0400 Subject: [PATCH 1/3] Updated environment files --- env/environment-3.10.yml | 8 -------- env/environment-3.11.yml | 11 ----------- env/environment-3.9.yml | 8 -------- 3 files changed, 27 deletions(-) diff --git a/env/environment-3.10.yml b/env/environment-3.10.yml index 77e27693..f815cc2e 100644 --- a/env/environment-3.10.yml +++ b/env/environment-3.10.yml @@ -35,10 +35,6 @@ dependencies: - docutils>=0.16 - flask_wtf>=1.1.1 - h5py>=3.9.0 -<<<<<<< HEAD -======= - - hotsoss>=0.1.9 ->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca - gunicorn>=21.1.0 - numpy>=1.25.1 - platon>=5.4 @@ -50,10 +46,6 @@ dependencies: - scipy>=1.11.1 - sphinx_astropy>=1.9.1 - svo-filters>=0.4.4 -<<<<<<< HEAD - werkzeug>=3.0.1 -======= - - werkzeug==2.0.3 ->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca - jwst_gtvt>=1.0.0 - astroquery>=0.4.6 diff --git a/env/environment-3.11.yml b/env/environment-3.11.yml index 8e5565e2..804107e1 100644 --- a/env/environment-3.11.yml +++ b/env/environment-3.11.yml @@ -32,16 +32,9 @@ dependencies: - bibtexparser>=1.4.0 - boto3>=1.28.5 - corner>=2.2.2 -<<<<<<< HEAD - docutils>=0.16ssss - flask_wtf>=1.1.1 - h5py>=3.9.0 -======= - - docutils>=0.16 - - flask_wtf>=1.1.1 - - h5py>=3.9.0 - - hotsoss>=0.1.9 ->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca - gunicorn>=21.1.0 - numpy>=1.25.1 - platon>=5.4 @@ -53,10 +46,6 @@ dependencies: - scipy>=1.11.1 - sphinx_astropy>=1.9.1 - svo-filters>=0.4.4 -<<<<<<< HEAD - werkzeug>=3.0.1 -======= - - werkzeug==2.0.3 ->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca - jwst_gtvt>=1.0.0 - astroquery>=0.4.6 diff --git a/env/environment-3.9.yml b/env/environment-3.9.yml index 6fd248df..77187f9b 100644 --- a/env/environment-3.9.yml +++ b/env/environment-3.9.yml @@ -35,10 +35,6 @@ dependencies: - docutils>=0.16 - flask_wtf>=1.1.1 - h5py>=3.9.0 -<<<<<<< HEAD -======= - - hotsoss>=0.1.9 ->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca - gunicorn>=21.1.0 - markupsafe==2.0.1 - numpy>=1.25.1 @@ -51,10 +47,6 @@ dependencies: - scipy>=1.11.1 - sphinx_astropy>=1.9.1 - svo-filters>=0.4.4 -<<<<<<< HEAD - werkzeug>=3.0.1 -======= - - werkzeug==2.0.3 ->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca - jwst_gtvt>=1.0.0 - astroquery>=0.4.6 \ No newline at end of file From 3d983be1c7c1d91d22fb75378b5ee7d9c5941c3e Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 1 Aug 2024 10:01:09 -0400 Subject: [PATCH 2/3] Typo fix --- env/environment-3.11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/environment-3.11.yml b/env/environment-3.11.yml index 804107e1..8eb7bec1 100644 --- a/env/environment-3.11.yml +++ b/env/environment-3.11.yml @@ -32,7 +32,7 @@ dependencies: - bibtexparser>=1.4.0 - boto3>=1.28.5 - corner>=2.2.2 - - docutils>=0.16ssss + - docutils>=0.16 - flask_wtf>=1.1.1 - h5py>=3.9.0 - gunicorn>=21.1.0 From 8878539252d7cead2b895144244b7bc4d72f2fdb Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Thu, 1 Aug 2024 10:08:20 -0400 Subject: [PATCH 3/3] Remove merge conflict in requirements.txt --- requirements.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 16f1cbf5..2a6a7f25 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,10 +14,6 @@ flask>=1.1.2 flask_wtf>=0.14.3 gunicorn>=20.1.0 h5py>=3.2.1 -<<<<<<< HEAD -======= -hotsoss>=0.1.9 ->>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca ipython>=7.22.0 jwst-gtvt>=1.0.0 matplotlib>=3.4.1