Skip to content

Commit b5cbab4

Browse files
PaulHuwePaulHuwe
committed
Rebase to B21
2 parents 9bc158c + d701374 commit b5cbab4

16 files changed

Lines changed: 909 additions & 684 deletions

File tree

‎00_install/environment.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ dependencies:
66
- matplotlib >= 3.2
77
- ipympl
88
- jsonschema >=4.8
9-
- numpy >= 2.0
9+
- lz4 >= 4.3.0
10+
- numpy >= 1.26
1011
- matplotlib
1112
- packaging
1213
- pandas >= 2.0.0
@@ -15,20 +16,25 @@ dependencies:
1516
- pyarrow >= 10.0.1
1617
- python == 3.14
1718
- pyyaml >= 6.0
19+
- ipympl
1820
- requests >=2.26
1921
- scipy >=1.14.1
2022
- pip:
21-
- asdf_standard
23+
- asdf_standard >=1.1.0
2224
- asdf >= 4.1.0,<6
23-
- asdf-astropy == 0.8.0
24-
- astropy >= 7.0
25+
- asdf-astropy >=0.8.0
26+
- astropy >= 6.0
2527
- crds >=13.0.2
2628
- drizzle >= 2.2,<2.3.0
2729
- gwcs >= 1.0.1,<2
2830
- stcal >= 1.18.0,<2
2931
- stpipe >=0.11.0,<2
32+
- rad >=1.0
3033
- roman_datamodels >=1.0
3134
- romancal >= 1.0
3235
- romanisim >= 0.14,<0.15
3336
- spherical_geometry >= 1.4.0,<1.5
37+
- semantic-version >= 2.8
3438
- stsci.imagestats >=1.8.3,<1.9
39+
- stcal >=1.17.0,<1.18
40+
- stpipe >=0.11.0,<0.12.0

‎00_install/verify_install.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
with open(Path(__file__).parent / "environment.yml") as environment_file:
2121
environment = yaml.safe_load(environment_file)
2222

23-
DEPENDENCY_PATTERN = re.compile(r"([\w\d.]+)\s*((?:[<>=~]=?|\^)\s*[\d\w.]*)?")
23+
DEPENDENCY_PATTERN = re.compile(r"([\w\d.-]+)\s*((?:[<>=~]=?|\^)\s*[\d\w.]*)?")
2424
MINIMUM_DEPENDENCY_PATTERN = re.compile(r".*>=?\s*([\d\w.]+).*")
2525

2626

‎01-Introduction/01-Introduction.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"- Last straw was dealing with World Coordinate Systems (WCS).\n",
3333
" - e.g., mapping array coordinates to physical coordinates such as sky coordinates and wavelengths.\n",
3434
" - FITS has WCS standards, but mostly restricted to idealized cases.\n",
35-
" - Do not handle sufficiently well needs of space telescope raw data.\n",
35+
" - Does not sufficiently handle needs of space telescope raw data.\n",
3636
" - We require complex distortion models with accuracies better than 0.01 pixels over fields of thousands of pixels.\n",
3737
" - Beyond what FITS WCS is capable of handling.\n",
3838
" - We need to carry the WCS with the raw data.\n",
@@ -129,7 +129,7 @@
129129
"metadata": {},
130130
"source": [
131131
"- Much more powerful than FITS WCS.\n",
132-
"- Later notebook will demonstrate."
132+
"- Demonstrated in Notebook 6."
133133
]
134134
},
135135
{

‎02-Working_With_ASDF_Files/02-Solutions.ipynb‎

Lines changed: 157 additions & 124 deletions
Large diffs are not rendered by default.

‎02-Working_With_ASDF_Files/02-Working_With_ASDF_Files.ipynb‎

Lines changed: 85 additions & 25 deletions
Large diffs are not rendered by default.

‎03-CLI/03-Solutions.ipynb‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,31 @@
2121
"tree:\n",
2222
" asdf_library:\n",
2323
" version:\n",
24-
"> 2.11.2.dev13+gf9aeb247\n",
24+
"> 5.1.0\n",
2525
"< 2.12.0\n",
2626
" history:\n",
2727
" extensions:\n",
2828
" -\n",
29+
" extension_class:\n",
30+
"> asdf.extension._manifest.ManifestExtension\n",
31+
"< asdf.extension.BuiltinExtension\n",
2932
" software:\n",
33+
" name:\n",
34+
"> asdf-astropy\n",
35+
"< asdf\n",
3036
" version:\n",
31-
"> 2.11.2.dev13+gf9aeb247\n",
37+
"> 0.10.0\n",
3238
"< 2.12.0\n",
39+
"> extension_uri:\n",
40+
"> asdf://asdf-format.org/core/extensions/core-1.5.0\n",
41+
"> manifest_software:\n",
42+
"> name:\n",
43+
"> asdf_standard\n",
44+
"> version:\n",
45+
"> 1.5.0\n",
46+
"> mass:\n",
47+
"> datatype:\n",
48+
"> float64\n",
3349
"> friend:\n",
3450
"> Mickey\n",
3551
"```\n"
@@ -47,6 +63,9 @@
4763
"% asdftool diff pluto-friend.asdf pluto.asdf -i '[asdf_library,history]'\n",
4864
"\n",
4965
"> tree:\n",
66+
"> mass:\n",
67+
"> datatype:\n",
68+
"> float64\n",
5069
"> friend:\n",
5170
"> Mickey\n",
5271
"```\n"

‎04-More_About_ASDF/04-More_About_ASDF.ipynb‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@
9999
"%TAG ! tag:stsci.edu:asdf/\n",
100100
"--- !core/asdf-1.1.0\n",
101101
"asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf',\n",
102-
" name: asdf, version: 4.1.0}\n",
102+
" name: asdf, version: 5.1.0}\n",
103103
"history:\n",
104104
" extensions:\n",
105105
" - !core/extension_metadata-1.0.0\n",
106106
" extension_class: asdf.extension._manifest.ManifestExtension\n",
107107
" extension_uri: asdf://asdf-format.org/core/extensions/core-1.6.0\n",
108-
" manifest_software: !core/software-1.0.0 {name: asdf_standard, version: 1.2.0}\n",
109-
" software: !core/software-1.0.0 {name: asdf, version: 4.1.0}\n",
108+
" manifest_software: !core/software-1.0.0 {name: asdf_standard, version: 1.5.0}\n",
109+
" software: !core/software-1.0.0 {name: asdf, version: 5.1.0}\n",
110110
"hello: world\n",
111111
"...\n",
112112
"\n"
@@ -185,33 +185,31 @@
185185
"%TAG ! tag:stsci.edu:asdf/\n",
186186
"--- !core/asdf-1.1.0\n",
187187
"asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf',\n",
188-
" name: asdf, version: 4.1.0}\n",
188+
" name: asdf, version: 5.1.0}\n",
189189
"history:\n",
190190
" extensions:\n",
191191
" - !core/extension_metadata-1.0.0\n",
192192
" extension_class: asdf.extension._manifest.ManifestExtension\n",
193193
" extension_uri: asdf://asdf-format.org/core/extensions/core-1.6.0\n",
194-
" manifest_software: !core/software-1.0.0 {name: asdf_standard, version: 1.2.0}\n",
195-
" software: !core/software-1.0.0 {name: asdf, version: 4.1.0}\n",
194+
" manifest_software: !core/software-1.0.0 {name: asdf_standard, version: 1.5.0}\n",
195+
" software: !core/software-1.0.0 {name: asdf, version: 5.1.0}\n",
196196
"array: !core/ndarray-1.1.0\n",
197197
" source: 0\n",
198198
" datatype: float64\n",
199199
" byteorder: little\n",
200200
" shape: [8, 8]\n",
201201
"...\n",
202-
"ÓBLK\u00000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000-8ªâ=)u\u0007cÔ-\u001a\u0011éaz;¯!Ýí?Ú¯í¼îÈâ?žW-£\u001a\u0011è?=g\u001fi¿\u001d",
203-
"í?žf'6)kí?¿’ƒâÌhé?µ\u001f~½\n",
204-
"‰ï?⿧OuŽÚ?OqÚ\u0004Dœì?°\\\u0002ó¨÷á?¡q|$îî?¾#)QH(Ô?1cd…",
205-
"sÿæ?x¯\u0005¥8âß?•¸|Ý —î?rÆâ\u0002ï€í?W-´YÕ\u000b",
206-
"ã?Ãp\u001aêñÂâ?X\u0007Ibs\u0010Ø?äd£J¨\u001aÃ?À›\u0001gЖ›?ÝQ;<߯ç?¬{¢”–òÜ?\\ú¬k\u0006þî?€;y®9†?NñÓ×\u0002é?ž–ëµ6Ö?‘5EæÄWë?h**\u0006ß~Ì?7š1ÐV>æ?z‡Û!SNÑ?T…",
207-
"`®};Þ?൚&˜ª–?ìt‹äïHÁ?\u0006æ5€Ü;ï?9\u0016Þ°ÿÿë?þ¼§‹ÿIá?¨\u0018eæñÍË?g~€1%xã?ZÈԙ¶?æ?XÄ\u0017«j9µ?°ä|j_}ê?[)ÖEf&ê?,oz\n",
208-
"G\n",
209-
"Ë?Á¶’nARè?v†W˜ Äë?Â\f",
210-
"TÊ;£à?>{\u0011;^Ãì?¤™jˆv\f",
211-
"Ñ?ܓpÍdÓÆ?+¸ö÷W¿ë?\u0019ððȔ_ç?H4MÌ_Šã?i\\ɑr4ä?Ôî\n",
212-
"éX\f",
213-
"Ó?À²n¤?ªt-R†ùâ?'<D§êræ?Û¡ëˆ#pá?K‰LJNoë?€Î\u001e",
214-
"\u0004\";¯?`ÜTÚÒ-Æ?@-jXz~Ï?ñT•ìMå?#ASDF BLOCK INDEX\n",
202+
"ÓBLK\u00000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0002\u0000É\u0001å\tàC‘\u0015ò\u0015ìŒyé\u0013@1\u0012—7³À?V\u0016ñä((Ô?Š·8ë7Cã?Ô\u0002]ŠQ.à?8ãw\n",
203+
"õæÒ?ç\n",
204+
"˜‘\u001c",
205+
"\u0005ä?&ŸzÛCùã?§j\n",
206+
"ß&­æ?\u0000;3á1Ùs?9SŸ\u0013Ï'é?ºØ,3›\u0010Ô?\u0002÷ò½µ’Ó?Æbêø1\u0000ê?àB¼vS\u0003Ÿ?\u0014”qËp\u0017Ù?ë\n",
207+
"Ž±Fyì?`ÿ\u0002öĪ?m\"àþµ0ç?ëª>¨4\u0010ë?\u001aŸ~QWåÖ?q\tÎ\u0003óùã?Jû>ä¡\u000e×?ËÒó­j\u0017ë?µVåW!,è?QŸê\u0014\u000eî?ñ—\u0010½°­å?Xя\u000e=c¼?¸@Uz­Ê?\u0016-GZ‘‹ë?¼Eg2ðcå?•·WÄâ?\u000ez\u0013ôøpÝ?©8H\u0011k{á?›p\u001a ˜‚ì?`\u0003őÌØ?²m€|\u00027Ò?Å+\"û‰>ã?Ø\u0001}b\u0017?Õ?ܳjo\f",
208+
"ÀÎ?d´\u0017Ó¶ëÄ?DSeþ\u0000ì?þ¡\u0012(pâ?¤“A\u001c",
209+
"ÆÉÚ?n+H%f<Õ?„§pì-ÕÇ?pê—\u001c",
210+
"h\u001a¡?\f",
211+
"á\u0007EêuÀ?De:ˆ\tØê?†Ñ*æ~:î?HŽ\u0015Ò±»Ü?ÌÖªXÎZÓ?t0nrèèÌ? É–«E\u0004Ã?T\u0004ëƒ\u000f$á?p¿y¬`º¾?Qáç“è¡æ?H'ë[gˆÀ?ü|~ý?\u001d",
212+
"Ï?pÔ¾e\u0017Ö?Ê7l:[×ë?L<²šÑÌ?ë´ß\u000f»~ë?\u0005{@ñ\u0007-ä?,¼QÛ\u001b4Û?#ASDF BLOCK INDEX\n",
215213
"%YAML 1.1\n",
216214
"---\n",
217215
"- 670\n",
@@ -324,19 +322,19 @@
324322
"%TAG ! tag:stsci.edu:asdf/\n",
325323
"--- !core/asdf-1.1.0\n",
326324
"asdf_library: !core/software-1.0.0 {author: The ASDF Developers, homepage: 'http://github.com/asdf-format/asdf',\n",
327-
" name: asdf, version: 4.1.0}\n",
325+
" name: asdf, version: 5.1.0}\n",
328326
"history:\n",
329327
" extensions:\n",
330328
" - !core/extension_metadata-1.0.0\n",
331329
" extension_class: asdf.extension._manifest.ManifestExtension\n",
332330
" extension_uri: asdf://asdf-format.org/core/extensions/core-1.6.0\n",
333-
" manifest_software: !core/software-1.0.0 {name: asdf_standard, version: 1.2.0}\n",
334-
" software: !core/software-1.0.0 {name: asdf, version: 4.1.0}\n",
331+
" manifest_software: !core/software-1.0.0 {name: asdf_standard, version: 1.5.0}\n",
332+
" software: !core/software-1.0.0 {name: asdf, version: 5.1.0}\n",
335333
" - !core/extension_metadata-1.0.0\n",
336334
" extension_class: asdf.extension._manifest.ManifestExtension\n",
337335
" extension_uri: asdf://asdf-format.org/transform/extensions/transform-1.6.0\n",
338336
" manifest_software: !core/software-1.0.0 {name: asdf_transform_schemas, version: 0.6.0}\n",
339-
" software: !core/software-1.0.0 {name: asdf-astropy, version: 0.8.0}\n",
337+
" software: !core/software-1.0.0 {name: asdf-astropy, version: 0.10.0}\n",
340338
"gaussian: !transform/gaussian1d-1.1.0\n",
341339
" amplitude: 1.0\n",
342340
" bounds:\n",

0 commit comments

Comments
 (0)