From 0b9c3840ae469dfe15359dd2ce9adb19046be3d6 Mon Sep 17 00:00:00 2001 From: Brian Cherinka Date: Tue, 16 Jan 2024 18:03:38 -0500 Subject: [PATCH 1/3] pinning highcharts version --- python/marvin/web/templates/explore.html | 10 +++++----- python/marvin/web/templates/galaxy.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/python/marvin/web/templates/explore.html b/python/marvin/web/templates/explore.html index 81d69b51..d16952e6 100644 --- a/python/marvin/web/templates/explore.html +++ b/python/marvin/web/templates/explore.html @@ -84,12 +84,12 @@ {% block code %} - - + + - - - + + + diff --git a/python/marvin/web/templates/galaxy.html b/python/marvin/web/templates/galaxy.html index 4fea0c74..0bca7b8c 100644 --- a/python/marvin/web/templates/galaxy.html +++ b/python/marvin/web/templates/galaxy.html @@ -10,12 +10,12 @@ {% block jshead %} - - + + - - - + + + From cc2db983bdf77372fc9394d398a374b00b143057 Mon Sep 17 00:00:00 2001 From: Brian Cherinka Date: Tue, 16 Jan 2024 18:18:47 -0500 Subject: [PATCH 2/3] syntax fix --- python/marvin/web/templates/galaxy.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/marvin/web/templates/galaxy.html b/python/marvin/web/templates/galaxy.html index 0bca7b8c..98c6f7ef 100644 --- a/python/marvin/web/templates/galaxy.html +++ b/python/marvin/web/templates/galaxy.html @@ -8,7 +8,7 @@ {% endblock csshead %} {% block jshead %} - + From d09ecda6d32970ffbc93bf259398fb9f65288066 Mon Sep 17 00:00:00 2001 From: Brian Cherinka Date: Wed, 17 Jan 2024 10:36:37 -0500 Subject: [PATCH 3/3] testing pytest bump --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 70f7bfb6..84027990 100644 --- a/setup.cfg +++ b/setup.cfg @@ -92,7 +92,7 @@ dev = matplotlib>=3.1.1 flake8>=3.7.9 doc8>=0.8.0 - pytest>=5.2.2 + pytest>=6.2.2 pytest-cov>=2.8.1 pytest-sugar>=0.9.4 pytest-remotedata>=0.3.2 @@ -102,7 +102,7 @@ dev = pytest-mock>=1.13.0 pytest-split>=0.8 isort>=4.3.21 - coveralls>=1.1 + coveralls>=3.0 codecov>=2.0.15 coverage[toml]>=5.0 ipdb>=0.12.3