Skip to content

Commit 5b62162

Browse files
authored
Merge pull request #3 from astronomy-commons/delucchi/dask
Create local cluster/client for all tests.
2 parents 5a2bc17 + c611b89 commit 5b62162

File tree

3 files changed

+84
-62
lines changed

3 files changed

+84
-62
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ classifiers = [
1717
dynamic = ["version"]
1818
requires-python = ">=3.10"
1919
dependencies = [
20-
"lsdb",
20+
"lsdb>=0.6.0",
2121
]
2222

2323
[project.urls]

tests/conftest.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
from pathlib import Path
22

33
import pytest
4+
from dask.distributed import Client, LocalCluster
45

56
TEST_DIR = Path(__file__).parent
67

78

9+
@pytest.fixture(scope="session", name="dask_client", autouse=True)
10+
def dask_client():
11+
"""Create a single client for use by all unit test cases."""
12+
cluster = LocalCluster(n_workers=1, threads_per_worker=1, dashboard_address=":0")
13+
client = Client(cluster)
14+
yield client
15+
client.close()
16+
cluster.close()
17+
18+
819
@pytest.fixture
920
def test_data_dir():
1021
return Path(TEST_DIR) / "data"

tests/data/fetch_catalogs.ipynb

Lines changed: 72 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,22 @@
1717
"metadata": {},
1818
"outputs": [],
1919
"source": [
20-
"full_delve = lsdb.read_hats('https://data.lsdb.io/hats/delve_dr2', columns=['QUICK_OBJECT_ID',\n",
21-
" 'RA',\n",
22-
" 'DEC',\n",
23-
" 'MAG_PSF_G',\n",
24-
" 'MAG_PSF_R',\n",
25-
" 'MAG_PSF_I',\n",
26-
" 'MAG_PSF_Z',\n",
27-
" 'MAGERR_PSF_G',\n",
28-
" 'MAGERR_PSF_R',\n",
29-
" 'MAGERR_PSF_I',\n",
30-
" 'MAGERR_PSF_Z',])"
20+
"full_delve = lsdb.read_hats(\n",
21+
" \"https://data.lsdb.io/hats/delve_dr2\",\n",
22+
" columns=[\n",
23+
" \"QUICK_OBJECT_ID\",\n",
24+
" \"RA\",\n",
25+
" \"DEC\",\n",
26+
" \"MAG_PSF_G\",\n",
27+
" \"MAG_PSF_R\",\n",
28+
" \"MAG_PSF_I\",\n",
29+
" \"MAG_PSF_Z\",\n",
30+
" \"MAGERR_PSF_G\",\n",
31+
" \"MAGERR_PSF_R\",\n",
32+
" \"MAGERR_PSF_I\",\n",
33+
" \"MAGERR_PSF_Z\",\n",
34+
" ],\n",
35+
")"
3136
]
3237
},
3338
{
@@ -57,7 +62,7 @@
5762
"metadata": {},
5863
"outputs": [],
5964
"source": [
60-
"cone_delve = full_delve.cone_search(ra=8.8567, dec=11.8167, radius_arcsec=25*60)"
65+
"cone_delve = full_delve.cone_search(ra=8.8567, dec=11.8167, radius_arcsec=25 * 60)"
6166
]
6267
},
6368
{
@@ -87,54 +92,60 @@
8792
"metadata": {},
8893
"outputs": [],
8994
"source": [
90-
"full_ps1 = lsdb.read_hats('s3://stpubdata/panstarrs/ps1/public/hats/otmo', margin_cache='s3://stpubdata/panstarrs/ps1/public/hats/otmo_10arcs',columns=['objName',\n",
91-
" 'objID',\n",
92-
" 'surveyID',\n",
93-
" 'qualityFlag',\n",
94-
" 'raMean',\n",
95-
" 'decMean',\n",
96-
" 'raMeanErr',\n",
97-
" 'decMeanErr',\n",
98-
" 'pmra',\n",
99-
" 'pmdec',\n",
100-
" 'pmraErr',\n",
101-
" 'pmdecErr',\n",
102-
" 'epochMean',\n",
103-
" 'gMeanPSFMag',\n",
104-
" 'gMeanPSFMagErr',\n",
105-
" 'gMeanPSFMagStd',\n",
106-
" 'gMeanPSFMagNpt',\n",
107-
" 'gMeanPSFMagMin',\n",
108-
" 'gMeanPSFMagMax',\n",
109-
" 'gFlags',\n",
110-
" 'rMeanPSFMag',\n",
111-
" 'rMeanPSFMagErr',\n",
112-
" 'rMeanPSFMagStd',\n",
113-
" 'rMeanPSFMagNpt',\n",
114-
" 'rMeanPSFMagMin',\n",
115-
" 'rMeanPSFMagMax',\n",
116-
" 'rFlags',\n",
117-
" 'iMeanPSFMag',\n",
118-
" 'iMeanPSFMagErr',\n",
119-
" 'iMeanPSFMagStd',\n",
120-
" 'iMeanPSFMagNpt',\n",
121-
" 'iMeanPSFMagMin',\n",
122-
" 'iMeanPSFMagMax',\n",
123-
" 'iFlags',\n",
124-
" 'zMeanPSFMag',\n",
125-
" 'zMeanPSFMagErr',\n",
126-
" 'zMeanPSFMagStd',\n",
127-
" 'zMeanPSFMagNpt',\n",
128-
" 'zMeanPSFMagMin',\n",
129-
" 'zMeanPSFMagMax',\n",
130-
" 'zFlags',\n",
131-
" 'yMeanPSFMag',\n",
132-
" 'yMeanPSFMagErr',\n",
133-
" 'yMeanPSFMagStd',\n",
134-
" 'yMeanPSFMagNpt',\n",
135-
" 'yMeanPSFMagMin',\n",
136-
" 'yMeanPSFMagMax',\n",
137-
" 'yFlags'])"
95+
"full_ps1 = lsdb.read_hats(\n",
96+
" \"s3://stpubdata/panstarrs/ps1/public/hats/otmo\",\n",
97+
" margin_cache=\"s3://stpubdata/panstarrs/ps1/public/hats/otmo_10arcs\",\n",
98+
" columns=[\n",
99+
" \"objName\",\n",
100+
" \"objID\",\n",
101+
" \"surveyID\",\n",
102+
" \"qualityFlag\",\n",
103+
" \"raMean\",\n",
104+
" \"decMean\",\n",
105+
" \"raMeanErr\",\n",
106+
" \"decMeanErr\",\n",
107+
" \"pmra\",\n",
108+
" \"pmdec\",\n",
109+
" \"pmraErr\",\n",
110+
" \"pmdecErr\",\n",
111+
" \"epochMean\",\n",
112+
" \"gMeanPSFMag\",\n",
113+
" \"gMeanPSFMagErr\",\n",
114+
" \"gMeanPSFMagStd\",\n",
115+
" \"gMeanPSFMagNpt\",\n",
116+
" \"gMeanPSFMagMin\",\n",
117+
" \"gMeanPSFMagMax\",\n",
118+
" \"gFlags\",\n",
119+
" \"rMeanPSFMag\",\n",
120+
" \"rMeanPSFMagErr\",\n",
121+
" \"rMeanPSFMagStd\",\n",
122+
" \"rMeanPSFMagNpt\",\n",
123+
" \"rMeanPSFMagMin\",\n",
124+
" \"rMeanPSFMagMax\",\n",
125+
" \"rFlags\",\n",
126+
" \"iMeanPSFMag\",\n",
127+
" \"iMeanPSFMagErr\",\n",
128+
" \"iMeanPSFMagStd\",\n",
129+
" \"iMeanPSFMagNpt\",\n",
130+
" \"iMeanPSFMagMin\",\n",
131+
" \"iMeanPSFMagMax\",\n",
132+
" \"iFlags\",\n",
133+
" \"zMeanPSFMag\",\n",
134+
" \"zMeanPSFMagErr\",\n",
135+
" \"zMeanPSFMagStd\",\n",
136+
" \"zMeanPSFMagNpt\",\n",
137+
" \"zMeanPSFMagMin\",\n",
138+
" \"zMeanPSFMagMax\",\n",
139+
" \"zFlags\",\n",
140+
" \"yMeanPSFMag\",\n",
141+
" \"yMeanPSFMagErr\",\n",
142+
" \"yMeanPSFMagStd\",\n",
143+
" \"yMeanPSFMagNpt\",\n",
144+
" \"yMeanPSFMagMin\",\n",
145+
" \"yMeanPSFMagMax\",\n",
146+
" \"yFlags\",\n",
147+
" ],\n",
148+
")"
138149
]
139150
},
140151
{
@@ -164,7 +175,7 @@
164175
"metadata": {},
165176
"outputs": [],
166177
"source": [
167-
"cone_ps1 = full_ps1.cone_search(ra=8.8567, dec=11.8167, radius_arcsec=25*60,fine=True)"
178+
"cone_ps1 = full_ps1.cone_search(ra=8.8567, dec=11.8167, radius_arcsec=25 * 60, fine=True)"
168179
]
169180
},
170181
{

0 commit comments

Comments
 (0)