diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c98a31125..5274196a2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -355,7 +355,6 @@ jobs: python tests/compare_scan_results.py \ --actual $outfile \ --expected $(echo tests/data/results_npz/${{ matrix.reco_algo }}/$(basename $outfile) | sed 's/.json/.npz/g') \ - --disqualify-zero-energy-pixels \ --assert \ || (cat $(ls *.diff.json) && false) - name: broker docker logs @@ -463,6 +462,5 @@ jobs: --actual /local/pkls/out.pkl \ --expected /local/pkls/$(basename $(ls tests/data/reco_pixel_pkls/${{ matrix.reco_algo }}/${{ matrix.dir }}/*.out.pkl)) \ --diff-out-dir /local/pkls/ \ - --disqualify-zero-energy-pixels \ --assert \ || (cat $(ls tests/data/reco_pixel_pkls/${{ matrix.reco_algo }}/${{ matrix.dir }}/*.diff.json) && false) \ No newline at end of file diff --git a/requirements-all.txt b/requirements-all.txt index 47c270362..f1c3a345b 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via @@ -22,7 +22,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -40,7 +40,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -54,7 +54,7 @@ matplotlib==3.7.1 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -nats-py[nkeys]==2.2.0 +nats-py[nkeys]==2.3.1 # via oms-mqclient nkeys==0.1.0 # via nats-py @@ -78,19 +78,19 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pika==1.3.2 # via oms-mqclient pillow==9.5.0 # via matplotlib -pulsar-client==3.1.0 +pulsar-client==3.2.0 # via oms-mqclient pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -119,21 +119,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index 22a4bcbb6..3cec09b81 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -34,11 +34,11 @@ healpy==1.16.2 # skymap-scanner (setup.py) htchirp==2.0 # via ewms-pilot -htcondor==10.3.0 +htcondor==10.5.0 # via skymap-scanner (setup.py) humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -72,7 +72,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib @@ -80,7 +80,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -109,21 +109,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) diff --git a/requirements-nats.txt b/requirements-nats.txt index b115e81e8..306cbf994 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -52,7 +52,7 @@ matplotlib==3.7.1 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -nats-py[nkeys]==2.2.0 +nats-py[nkeys]==2.3.1 # via oms-mqclient nkeys==0.1.0 # via nats-py @@ -76,7 +76,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib @@ -84,7 +84,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -113,21 +113,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index c729cfd43..d9c252f24 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via @@ -22,7 +22,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -72,17 +72,17 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib -pulsar-client==3.1.0 +pulsar-client==3.2.0 # via oms-mqclient pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -111,21 +111,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index 21643660d..d73976c4e 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -70,7 +70,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pika==1.3.2 # via oms-mqclient @@ -80,7 +80,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -109,21 +109,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) diff --git a/requirements.txt b/requirements.txt index 8d09f71da..b211b4c2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -70,7 +70,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib @@ -78,7 +78,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -107,21 +107,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) diff --git a/tests/compare_reco_pixel_pkl.py b/tests/compare_reco_pixel_pkl.py index 51991f75c..e5a4a55b1 100644 --- a/tests/compare_reco_pixel_pkl.py +++ b/tests/compare_reco_pixel_pkl.py @@ -50,12 +50,6 @@ def main(): action="store_true", help="'assert' the results", ) - parser.add_argument( # TODO: remove? - "--disqualify-zero-energy-pixels", - default=False, - action="store_true", - help='whether a zero-energy pixel value "disqualifies" the entire pixel\'s numerical results', - ) args = parser.parse_args() logging_tools.log_argparse_args(args, logger=logger, level="WARNING") @@ -81,7 +75,6 @@ def load_from_out_pkl(out_pkl_fpath: Path) -> SkyScanResult: args.do_assert, args.diff_out_dir, logger, - args.disqualify_zero_energy_pixels, # TODO: remove? ) diff --git a/tests/compare_scan_results.py b/tests/compare_scan_results.py index a0497461a..ad265146d 100644 --- a/tests/compare_scan_results.py +++ b/tests/compare_scan_results.py @@ -55,12 +55,6 @@ def main(): action="store_true", help="'assert' the results", ) - parser.add_argument( # TODO: remove? - "--disqualify-zero-energy-pixels", - default=False, - action="store_true", - help='whether a zero-energy pixel value "disqualifies" the entire pixel\'s numerical results', - ) args = parser.parse_args() logging_tools.log_argparse_args(args, logger=logger, level="WARNING") @@ -78,7 +72,6 @@ def main(): args.do_assert, args.diff_out_dir, logger, - args.disqualify_zero_energy_pixels, # TODO: remove? ) @@ -90,7 +83,6 @@ def compare_then_exit( do_assert: bool, diff_out_dir: str, logger: logging.Logger, - do_disqualify_zero_energy_pixels: bool, # TODO: remove? ) -> None: """Compare the results, dump a json diff file, and sys.exit.""" dump_json_diff = ( @@ -101,7 +93,6 @@ def compare_then_exit( close = actual.is_close( expected, dump_json_diff=dump_json_diff, - do_disqualify_zero_energy_pixels=do_disqualify_zero_energy_pixels, # TODO: remove? ) equal = actual == expected