Bump to SkyPortal 0bd5f691fe7f1f773f33a3511089bc2fbec8bdcf

grandma-collaboration · Oct 3, 2024 · d7339a3 · d7339a3
1 parent 7307784
commit d7339a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/extensions/skyportal/baselayer/app/test_util.py b/extensions/skyportal/baselayer/app/test_util.py
@@ -144,6 +144,8 @@ def click_css(self, css, timeout=10, scroll_parent=False):
 
 @pytest.fixture(scope="session")
 def driver(request):
+    import shutil
+
     from selenium import webdriver
     from webdriver_manager.firefox import GeckoDriverManager
 
@@ -164,9 +166,11 @@ def driver(request):
         ),
     )
 
-    service = webdriver.firefox.service.Service(
-        executable_path=GeckoDriverManager().install()
-    )
+    executable_path = shutil.which("geckodriver")
+    if executable_path is None:
+        executable_path = GeckoDriverManager().install()
+    service = webdriver.firefox.service.Service(executable_path=executable_path)
+
     driver = MyCustomWebDriver(options=options, service=service)
     driver.set_window_size(1920, 1200)
     login(driver)

diff --git a/skyportal b/skyportal
+1 −1		baselayer
+2 −2		doc/conf.py
+2 −3		doc/openapi.html.template
+10 −11		package.json
+1 −1		requirements.docs.txt
+22 −22		requirements.txt
+1 −1		skyportal/handlers/api/analysis.py
+3 −0		skyportal/handlers/api/comment.py
+11 −3		skyportal/handlers/api/gcn.py
+1 −1		skyportal/handlers/api/internal/log.py
+1 −1		skyportal/handlers/api/invalid.py
+1 −1		skyportal/handlers/api/reminder.py
+11 −1		skyportal/handlers/api/source.py
+10 −0		skyportal/openapi.py
+19 −7		static/js/components/photometry/PhotometryTable.jsx