Commit 3263e9783cd4bfeb638245f815137b4ba62b2f4d - drms

+9

-0

CHANGELOG.rst less more

	0	Drms v0.6.1 (2021-01-23)
	1	========================
	2
	3	Bug Fixes
	4	---------
	5
	6	- Fixed issue with downloads not having the primekeys substituted with their correct values in downloaded filenames. (`#52 <https://github.com/sunpy/drms/pull/52>`__)
	7
	8
0	9	drms v0.6.0 (2020-11-01)
1	10	========================
2	11

+1

-1

PKG-INFO less more

0	0	Metadata-Version: 2.1
1	1	Name: drms
2		Version: 0.6.0
	2	Version: 0.6.1
3	3	Summary: "Access HMI, AIA and MDI data with Python"
4	4	Home-page: https://sunpy.org
5	5	Author: The SunPy Community

+3

-0

docs/conf.py less more

7	7
8	8	# -- Project information -----------------------------------------------------
9	9
	10	import os
10	11	from drms import __version__
11	12
12	13	project = 'drms'

89	90	except ImportError:
90	91	html_theme = 'default'
91	92
	93	# JSOC email os env
	94	os.environ["JSOC_EMAIL"] = "jsoc@cadair.com"
92	95
93	96	# Add any paths that contain custom static files (such as style sheets) here,
94	97	# relative to this directory. They are copied after the builtin static files,

+2

-1

drms/_version.py less more

0	0	# coding: utf-8
1	1	# file generated by setuptools_scm
2	2	# don't change, don't track in version control
3		version = '0.6.0'
	3	version = '0.6.1'
	4	version_tuple = (0, 6, 1)

+1

-1

drms/client.py less more

681	681	if si.keywords.loc[k].is_time:
682	682	pkfmt_list.append(f'{{{k}:A}}')
683	683	else:
684		pkfmt_list.append(f'{k}')
	684	pkfmt_list.append(f'{{{k}}}')
685	685
686	686	if pkfmt_list:
687	687	return '{}.{}.{{segment}}'.format(si.name, '.'.join(pkfmt_list))

+10

-10

drms/json.py less more

367	367	method = 'url'
368	368
369	369	if protocol in img_protocol_list:
370		d = {'ct': 'grey.sao', 'scaling': 'MINMAX', 'size': 1}
	370	extra_keys = {'ct': 'grey.sao', 'scaling': 'MINMAX', 'size': 1}
371	371	if protocol_args is not None:
372	372	for k, v in protocol_args.items():
373	373	if k.lower() == 'ct':
374		d['ct'] = v
	374	extra_keys['ct'] = v
375	375	elif k == 'scaling':
376		d[k] = v
	376	extra_keys[k] = v
377	377	elif k == 'size':
378		d[k] = int(v)
	378	extra_keys[k] = int(v)
379	379	elif k in ['min', 'max']:
380		d[k] = float(v)
	380	extra_keys[k] = float(v)
381	381	else:
382	382	raise ValueError(f'Unknown protocol argument: {k}')
383		protocol += ',CT={ct},scaling={scaling},size={size}'.format(**d)
384		if 'min' in d:
385		protocol += f',min={d["min"]:g}'
386		if 'max' in d:
387		protocol += f',max={d["max"]:g}'
	383	protocol += ',CT={ct},scaling={scaling},size={size}'.format(**extra_keys)
	384	if 'min' in extra_keys:
	385	protocol += f',min={extra_keys["min"]:g}'
	386	if 'max' in extra_keys:
	387	protocol += f',max={extra_keys["max"]:g}'
388	388	else:
389	389	if protocol_args is not None:
390	390	raise ValueError(f'protocol_args not supported for protocol {protocol}')

+1

-1

drms/utils.py less more

67	67	if force or s.str.endswith('_TAI').any():
68	68	s = s.str.replace('_TAI', "")
69	69	s = s.str.replace('_', ' ')
70		s = s.str.replace('.', '-', n=2)
	70	s = s.str.replace('.', '-', regex=True, n=2)
71	71	res = _pd_to_datetime_coerce(s)
72	72	res = res.dt.tz_localize(None)
73	73	return res.iloc[0] if (len(res) == 1) and np.isscalar(tstr) else res

+1

-1

drms.egg-info/PKG-INFO less more

0	0	Metadata-Version: 2.1
1	1	Name: drms
2		Version: 0.6.0
	2	Version: 0.6.1
3	3	Summary: "Access HMI, AIA and MDI data with Python"
4	4	Home-page: https://sunpy.org
5	5	Author: The SunPy Community

+3

-2

examples/cutout_export_request.py less more

16	16
17	17	# This example requires a registered export email address. You can register
18	18	# JSOC exports at: http://jsoc.stanford.edu/ajax/register_email.html
19		email = 'nabil.freij@gmail.com'
	19	# You must supply your own email.
	20	email = os.environ["JSOC_EMAIL"]
20	21
21	22	# Download directory
22	23	out_dir = os.path.join('downloads')

26	27	os.makedirs(out_dir)
27	28
28	29	###############################################################################
29		# Construct the DRMS query string: "Series[harpnum][timespan]{data segments}"
	30	# Construct the DRMS query string: "Series[timespan][wavelength]{data segments}"
30	31
31	32	qstr = 'aia.lev1_euv_12s[2015-10-17T04:33:30.000/1m@12s][171]{image}'
32	33	print(f'Data export query:\n {qstr}\n')

+2

-1

examples/export_as_is.py less more

21	21
22	22	# This example requires a registered export email address. You can register
23	23	# JSOC exports at: http://jsoc.stanford.edu/ajax/register_email.html
24		email = 'nabil.freij@gmail.com'
	24	# You must supply your own email.
	25	email = os.environ["JSOC_EMAIL"]
25	26
26	27	# Download directory
27	28	out_dir = os.path.join('downloads')

+2

-1

examples/export_fits.py less more

21	21
22	22	# This example requires a registered export email address. You can register
23	23	# JSOC exports at: http://jsoc.stanford.edu/ajax/register_email.html
24		email = 'nabil.freij@gmail.com'
	24	# You must supply your own email.
	25	email = os.environ["JSOC_EMAIL"]
25	26
26	27	# Use 'as-is' instead of 'fits', if record keywords are not needed in the
27	28	# FITS header. This greatly reduces the server load!

+2

-1

examples/export_jpg.py less more

22	22
23	23	# This example requires a registered export email address. You can register
24	24	# JSOC exports at: http://jsoc.stanford.edu/ajax/register_email.html
25		email = 'nabil.freij@gmail.com'
	25	# You must supply your own email.
	26	email = os.environ["JSOC_EMAIL"]
26	27
27	28	# Arguments for 'jpg' protocol
28	29	jpg_args = {

+2

-1

examples/export_movie.py less more

22	22
23	23	# This example requires a registered export email address. You can register
24	24	# JSOC exports at: http://jsoc.stanford.edu/ajax/register_email.html
25		email = 'nabil.freij@gmail.com'
	25	# You must supply your own email.
	26	email = os.environ["JSOC_EMAIL"]
26	27
27	28	# Download directory
28	29	out_dir = 'downloads'

+3

-1

examples/export_print_urls.py less more

7	7
8	8	Note that there is no "Request URL" for method 'url_quick'.
9	9	"""
	10	import os
10	11
11	12	import drms
12	13

17	18
18	19	# This example requires a registered export email address. You can register
19	20	# JSOC exports at: http://jsoc.stanford.edu/ajax/register_email.html
20		email = 'nabil.freij@gmail.com'
	21	# You must supply your own email.
	22	email = os.environ["JSOC_EMAIL"]
21	23
22	24	###############################################################################
23	25	# Construct the DRMS query string: "Series[timespan][wavelength]"

+2

-1

examples/export_tar.py less more

24	24
25	25	# This example requires a registered export email address. You can register
26	26	# JSOC exports at: http://jsoc.stanford.edu/ajax/register_email.html
27		email = 'nabil.freij@gmail.com'
	27	# You must supply your own email.
	28	email = os.environ["JSOC_EMAIL"]
28	29
29	30	# Download directory
30	31	out_dir = 'downloads'

+2

-2

setup.cfg less more

72	72	junit_family = xunit2
73	73
74	74	[pycodestyle]
75		max_line_length = 100
	75	max_line_length = 110
76	76
77	77	[flake8]
78		max-line-length = 100
	78	max-line-length = 110
79	79	exclude =
80	80	.git,
81	81	__pycache__,

+6

-4

tox.ini less more

0	0	[tox]
1	1	envlist =
2		py{37,38}{,-online,-sunpy}
	2	py{37,38,39}{,-online,-sunpy}
3	3	build_docs
4	4	codestyle
5	5	isolated_build = true

28	28	MPLBACKEND = agg
29	29	COLUMNS = 180
30	30	PYTEST_COMMAND = pytest -vvv -s -ra --pyargs drms --cov-report=xml --cov=drms --cov-config={toxinidir}/setup.cfg {toxinidir}/docs
31		devdeps,build_docs,online: HOME = {envtmpdir}
	31	build_docs,online: HOME = {envtmpdir}
32	32	passenv =
33	33	HTTP_PROXY
34	34	HTTPS_PROXY

40	40	online: pytest-timeout
41	41	# We want to run the sunpy jsoc tests
42	42	sunpy: sunpy[all]
	43	# All our tests run in parallel which this plugin allows us to.
	44	pytest-xdist
43	45	# The following indicates which extras_require from setup.cfg will be installed
44	46	# dev is special in that it installs everything
45	47	extras =
46	48	dev
47	49	commands =
48		sunpy: pytest -vvv -s -ra --pyargs sunpy.net.jsoc --remote-data=any -m "remote_data" {posargs}
	50	sunpy: pytest -vvv -s -ra --pyargs sunpy.net.jsoc --remote-data=any {posargs}
49	51	!online: {env:PYTEST_COMMAND} {posargs}
50		online: {env:PYTEST_COMMAND} --reruns 2 --timeout=180 --remote-data=any -m "remote_data" --email nabil.freij@gmail.com {posargs}
	52	online: {env:PYTEST_COMMAND} --reruns 2 --reruns-delay 60 --timeout=300 --remote-data=any --email jsoc@cadair.com {posargs}
51	53
52	54	[testenv:build_docs]
53	55	changedir = docs