Merge branch 'master' into fixdependabot

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.3.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
         exclude: &exclude_pattern '^LIGO_skymaps/'
     -   id: trailing-whitespace
         exclude: *exclude_pattern
 -   repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.6.0
     hooks:
     -   id: black
         exclude: *exclude_pattern

requirements.txt

@@ -6,7 +6,7 @@ ampel-ztf==0.7.4
 astropy==5.1
 astroquery==0.4.4
 backoff==1.11.1
-black==22.1.0
+black==22.3.0
 coveralls == 3.3.1
 geopandas==0.10.2
 gwemopt==0.0.73

setup.py

@@ -29,7 +29,7 @@
         "ampel-photometry == 0.7.1",
         "ampel-ztf == 0.7.4.post1",
         "astropy == 5.1",
-        "black == 22.1.0",
+        "black == 22.3.0",
         "backoff == 1.11.1",
         "coveralls == 3.3.1",
         "geopandas == 0.10.2",

tests/test_fritz.py

@@ -7,6 +7,9 @@
 import astropy.units as u
 from nuztf.fritz import save_source_to_group, delete_source_from_group
 
+ztf_id = "ZTF21abyonuw"
+ztf_group = 1430
+
 
 class TestFritz(unittest.TestCase):
     def setUp(self):
@@ -17,10 +20,13 @@ def test_fritz(self):
 
         self.logger.info("\n\n Testing Fritz queries \n\n")
 
-        ztf_id = "ZTF21abyonuw"
+        delete_source_from_group(ztf_id, group_id=ztf_group)
 
-        response = save_source_to_group(ztf_id, group_id=1430)
+        response = save_source_to_group(ztf_id, group_id=ztf_group)
         self.assertEqual(response.status_code, 200)
 
-        response = delete_source_from_group(ztf_id, group_id=1430)
+        response = delete_source_from_group(ztf_id, group_id=ztf_group)
         self.assertEqual(response.status_code, 200)
+
+    def tearDown(self):
+        delete_source_from_group(ztf_id, group_id=ztf_group)