Skip to content

Plotting functions cleanup #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlincett merged 26 commits into from
Oct 12, 2023
Merged

Plotting functions cleanup #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
92cfc29
deprecate log_func
mlincett Sep 29, 2023
01931ce
<bot> update requirements-examples.txt
wipacdevbot Sep 29, 2023
bfdf70e
<bot> update requirements-tests.txt
wipacdevbot Sep 29, 2023
036a620
<bot> update requirements.txt
wipacdevbot Sep 29, 2023
478b2af
deprecate upload-func
mlincett Sep 29, 2023
36b94d3
deprecate further slack posting logic
mlincett Sep 29, 2023
ff212e4
further remove deprecated logic
mlincett Sep 29, 2023
5d23c1b
assume we always save plots
mlincett Sep 29, 2023
e8cee41
single source of truth for inches/dpi
mlincett Sep 29, 2023
6b6840d
remove unused vars
mlincett Sep 29, 2023
d3f4431
remove import io
mlincett Sep 29, 2023
1ee865a
update example
mlincett Sep 29, 2023
cda9860
de-type plotting function
mlincett Sep 29, 2023
3d6747f
some notes from mypy
mlincett Sep 29, 2023
b0730dc
mypy readiness step
mlincett Sep 29, 2023
8270f73
deprecate test for npz format
mlincett Oct 9, 2023
7b9e266
<bot> update setup.cfg
wipacdevbot Oct 9, 2023
d40342a
<bot> update requirements-examples.txt
wipacdevbot Oct 9, 2023
8d1ee52
<bot> update requirements-tests.txt
wipacdevbot Oct 9, 2023
fbfe60c
<bot> update requirements.txt
wipacdevbot Oct 9, 2023
a9c454f
use new interface to colormaps
mlincett Oct 10, 2023
7a0d644
list to array
mlincett Oct 10, 2023
a08488d
calculate area
mlincett Oct 11, 2023
86e2d46
make it a static metod
mlincett Oct 11, 2023
bcf288e
annotate mypy errors
mlincett Oct 11, 2023
57b5231
partial mypy compliance; annotate errors
mlincett Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions .github/workflows/wipac-cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,48 +84,6 @@ jobs:
if: always()
run: |
more *.json | cat

functionality-tests:
needs: [py-versions]
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
input-file: [ "millipede_wilks/run00136662.evt000035405932.neutrino_1" ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.py3 }}
- uses: actions/checkout@v3
with:
repository: icecube/skymap_scanner
ref: main
path: skymap_scanner
sparse-checkout: tests/data
- name: pip install
run: |
pip install --upgrade pip wheel setuptools
pip install .
- name: Run conversion script
# working-directory: auxiliary-repo/path/to/directory # Replace 'path/to/directory' with the path to the directory containing your Python script
run: |
python examples/npz_to_json.py --input-file skymap_scanner/tests/data/results_npz/${{ matrix.input-file }}.npz --output-dir .
cat $(ls -Art | tail -n 1) # cat outfile

# Wait for skymap_scanner PR#163
# - name: Compare output
# run: |
# tree
# outfile=$(ls -Art | tail -n 1)
# diff $outfile skymap_scanner/tests/data/results_json/${{ matrix.input-file }}.json







release:
# only run on main/master/default
Expand Down
4 changes: 2 additions & 2 deletions examples/plot_skydriver_scan_result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def main() -> None:
serialzed = rc.request_seq("GET", f"/scan/{args.scan_id}/result")["skyscan_result"]

result = SkyScanResult.deserialize(serialzed)
result.create_plot(dosave=True)
result.create_plot_zoomed(dosave=True, plot_bounding_box=True)
result.create_plot()
result.create_plot_zoomed(plot_bounding_box=True)


if __name__ == "__main__":
Expand Down
48 changes: 25 additions & 23 deletions requirements-examples.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@
#
# pip-compile --extra=examples --output-file=requirements-examples.txt
#
astropy==5.3.1
astropy==5.3.4
# via
# healpy
# icecube-skyreader (setup.py)
cachetools==5.3.1
# via wipac-rest-tools
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via cryptography
charset-normalizer==3.2.0
charset-normalizer==3.3.0
# via requests
contourpy==1.1.0
contourpy==1.1.1
# via matplotlib
cryptography==41.0.3
cryptography==41.0.4
# via pyjwt
cycler==0.11.0
cycler==0.12.1
# via matplotlib
fonttools==4.42.0
fonttools==4.43.1
# via matplotlib
healpy==1.16.3
healpy==1.16.6
# via icecube-skyreader (setup.py)
idna==3.4
# via requests
kiwisolver==1.4.4
kiwisolver==1.4.5
# via matplotlib
matplotlib==3.7.2
matplotlib==3.8.0
# via
# healpy
# icecube-skyreader (setup.py)
meander==0.0.3
# via icecube-skyreader (setup.py)
numpy==1.25.2
numpy==1.26.0
# via
# astropy
# contourpy
Expand All @@ -46,29 +46,29 @@ numpy==1.25.2
# pandas
# pyerfa
# scipy
packaging==23.1
packaging==23.2
# via
# astropy
# matplotlib
pandas==2.0.3
pandas==2.1.1
# via icecube-skyreader (setup.py)
pillow==10.0.0
pillow==10.0.1
# via matplotlib
pycparser==2.21
# via cffi
pyerfa==2.0.0.3
# via astropy
pyjwt[crypto]==2.8.0
# via wipac-rest-tools
pyparsing==3.0.9
pyparsing==3.1.1
# via matplotlib
pypng==0.20220715.0
# via qrcode
python-dateutil==2.8.2
# via
# matplotlib
# pandas
pytz==2023.3
pytz==2023.3.post1
# via pandas
pyyaml==6.0.1
# via astropy
Expand All @@ -81,23 +81,25 @@ requests==2.31.0
# wipac-rest-tools
requests-futures==1.0.1
# via wipac-rest-tools
scipy==1.11.1
scipy==1.11.3
# via healpy
six==1.16.0
# via python-dateutil
tornado==6.3.2
tornado==6.3.3
# via wipac-rest-tools
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# qrcode
# wipac-dev-tools
tzdata==2023.3
# via pandas
urllib3==2.0.4
# via requests
wipac-dev-tools==1.6.16
urllib3==2.0.6
# via
# requests
# wipac-rest-tools
wipac-dev-tools==1.7.0
# via
# icecube-skyreader (setup.py)
# wipac-rest-tools
wipac-rest-tools==1.5.1
wipac-rest-tools==1.5.3
# via icecube-skyreader (setup.py)
42 changes: 21 additions & 21 deletions requirements-tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@
#
# pip-compile --extra=tests --output-file=requirements-tests.txt
#
astropy==5.3.1
astropy==5.3.4
# via
# healpy
# icecube-skyreader (setup.py)
certifi==2023.7.22
# via requests
charset-normalizer==3.2.0
charset-normalizer==3.3.0
# via requests
contourpy==1.1.0
contourpy==1.1.1
# via matplotlib
cycler==0.11.0
cycler==0.12.1
# via matplotlib
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via pytest
fonttools==4.42.0
fonttools==4.43.1
# via matplotlib
healpy==1.16.3
healpy==1.16.6
# via icecube-skyreader (setup.py)
idna==3.4
# via requests
iniconfig==2.0.0
# via pytest
kiwisolver==1.4.4
kiwisolver==1.4.5
# via matplotlib
matplotlib==3.7.2
matplotlib==3.8.0
# via
# healpy
# icecube-skyreader (setup.py)
meander==0.0.3
# via icecube-skyreader (setup.py)
numpy==1.25.2
numpy==1.26.0
# via
# astropy
# contourpy
Expand All @@ -44,22 +44,22 @@ numpy==1.25.2
# pandas
# pyerfa
# scipy
packaging==23.1
packaging==23.2
# via
# astropy
# matplotlib
# pytest
pandas==2.0.3
pandas==2.1.1
# via icecube-skyreader (setup.py)
pillow==10.0.0
pillow==10.0.1
# via matplotlib
pluggy==1.2.0
pluggy==1.3.0
# via pytest
pyerfa==2.0.0.3
# via astropy
pyparsing==3.0.9
pyparsing==3.1.1
# via matplotlib
pytest==7.4.0
pytest==7.4.2
# via
# icecube-skyreader (setup.py)
# pytest-mock
Expand All @@ -69,23 +69,23 @@ python-dateutil==2.8.2
# via
# matplotlib
# pandas
pytz==2023.3
pytz==2023.3.post1
# via pandas
pyyaml==6.0.1
# via astropy
requests==2.31.0
# via wipac-dev-tools
scipy==1.11.1
scipy==1.11.3
# via healpy
six==1.16.0
# via python-dateutil
tomli==2.0.1
# via pytest
typing-extensions==4.7.1
typing-extensions==4.8.0
# via wipac-dev-tools
tzdata==2023.3
# via pandas
urllib3==2.0.4
urllib3==2.0.6
# via requests
wipac-dev-tools==1.6.16
wipac-dev-tools==1.7.0
# via icecube-skyreader (setup.py)
36 changes: 18 additions & 18 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@
#
# pip-compile --output-file=requirements.txt
#
astropy==5.3.1
astropy==5.3.4
# via
# healpy
# icecube-skyreader (setup.py)
certifi==2023.7.22
# via requests
charset-normalizer==3.2.0
charset-normalizer==3.3.0
# via requests
contourpy==1.1.0
contourpy==1.1.1
# via matplotlib
cycler==0.11.0
cycler==0.12.1
# via matplotlib
fonttools==4.42.0
fonttools==4.43.1
# via matplotlib
healpy==1.16.3
healpy==1.16.6
# via icecube-skyreader (setup.py)
idna==3.4
# via requests
kiwisolver==1.4.4
kiwisolver==1.4.5
# via matplotlib
matplotlib==3.7.2
matplotlib==3.8.0
# via
# healpy
# icecube-skyreader (setup.py)
meander==0.0.3
# via icecube-skyreader (setup.py)
numpy==1.25.2
numpy==1.26.0
# via
# astropy
# contourpy
Expand All @@ -40,37 +40,37 @@ numpy==1.25.2
# pandas
# pyerfa
# scipy
packaging==23.1
packaging==23.2
# via
# astropy
# matplotlib
pandas==2.0.3
pandas==2.1.1
# via icecube-skyreader (setup.py)
pillow==10.0.0
pillow==10.0.1
# via matplotlib
pyerfa==2.0.0.3
# via astropy
pyparsing==3.0.9
pyparsing==3.1.1
# via matplotlib
python-dateutil==2.8.2
# via
# matplotlib
# pandas
pytz==2023.3
pytz==2023.3.post1
# via pandas
pyyaml==6.0.1
# via astropy
requests==2.31.0
# via wipac-dev-tools
scipy==1.11.1
scipy==1.11.3
# via healpy
six==1.16.0
# via python-dateutil
typing-extensions==4.7.1
typing-extensions==4.8.0
# via wipac-dev-tools
tzdata==2023.3
# via pandas
urllib3==2.0.4
urllib3==2.0.6
# via requests
wipac-dev-tools==1.6.16
wipac-dev-tools==1.7.0
# via icecube-skyreader (setup.py)
3 changes: 2 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ classifiers =
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
download_url = https://pypi.org/project/icecube-skyreader/
project_urls =
Tracker = https://github.com/icecube/skyreader/issues
Expand All @@ -53,7 +54,7 @@ install_requires =
numpy
pandas
wipac-dev-tools
python_requires = >=3.8, <3.12
python_requires = >=3.8, <3.13
packages = find:

[options.extras_require]
Expand Down
Loading