dask-ms 0.2.26__tar.gz → 0.2.28__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (143) hide show
  1. {dask_ms-0.2.26 → dask_ms-0.2.28}/.github/workflows/ci.yml +5 -5
  2. {dask_ms-0.2.26 → dask_ms-0.2.28}/.github/workflows/pre-commit.yml +1 -1
  3. {dask_ms-0.2.26 → dask_ms-0.2.28}/HISTORY.rst +20 -8
  4. {dask_ms-0.2.26 → dask_ms-0.2.28}/PKG-INFO +1 -1
  5. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/__init__.py +1 -1
  6. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/conftest.py +1 -1
  7. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/tests/test_parquet.py +1 -1
  8. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/katdal_import.py +3 -10
  9. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/msv2_facade.py +174 -137
  10. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/zarr/tests/test_zarr.py +1 -1
  11. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_fsspec_store.py +9 -7
  12. {dask_ms-0.2.26 → dask_ms-0.2.28}/pyproject.toml +1 -1
  13. {dask_ms-0.2.26 → dask_ms-0.2.28}/tbump.toml +1 -1
  14. {dask_ms-0.2.26 → dask_ms-0.2.28}/.github/ISSUE_TEMPLATE.md +0 -0
  15. {dask_ms-0.2.26 → dask_ms-0.2.28}/.github/PULL_REQUEST_TEMPLATE.md +0 -0
  16. {dask_ms-0.2.26 → dask_ms-0.2.28}/.github/dependabot.yml +0 -0
  17. {dask_ms-0.2.26 → dask_ms-0.2.28}/.github/workflows/readthedocs.yml +0 -0
  18. {dask_ms-0.2.26 → dask_ms-0.2.28}/.gitignore +0 -0
  19. {dask_ms-0.2.26 → dask_ms-0.2.28}/.pre-commit-config.yaml +0 -0
  20. {dask_ms-0.2.26 → dask_ms-0.2.28}/.travis/python36.docker +0 -0
  21. {dask_ms-0.2.26 → dask_ms-0.2.28}/.travis/python37.docker +0 -0
  22. {dask_ms-0.2.26 → dask_ms-0.2.28}/.travis/python38.docker +0 -0
  23. {dask_ms-0.2.26 → dask_ms-0.2.28}/.travis.yml +0 -0
  24. {dask_ms-0.2.26 → dask_ms-0.2.28}/AUTHORS.rst +0 -0
  25. {dask_ms-0.2.26 → dask_ms-0.2.28}/CONTRIBUTING.rst +0 -0
  26. {dask_ms-0.2.26 → dask_ms-0.2.28}/LICENSE +0 -0
  27. {dask_ms-0.2.26 → dask_ms-0.2.28}/MANIFEST.in +0 -0
  28. {dask_ms-0.2.26 → dask_ms-0.2.28}/Makefile +0 -0
  29. {dask_ms-0.2.26 → dask_ms-0.2.28}/README.rst +0 -0
  30. {dask_ms-0.2.26 → dask_ms-0.2.28}/conftest.py +0 -0
  31. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/__init__.py +0 -0
  32. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/application.py +0 -0
  33. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/conf/logging.ini +0 -0
  34. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/conftest.py +0 -0
  35. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/convert.py +0 -0
  36. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/entrypoint.py +0 -0
  37. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/formats.py +0 -0
  38. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/fragments.py +0 -0
  39. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/katdal_import.py +0 -0
  40. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/tests/test_chunk_transformer.py +0 -0
  41. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/apps/tests/test_convert.py +0 -0
  42. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/columns.py +0 -0
  43. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/config.py +0 -0
  44. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/constants.py +0 -0
  45. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/dask_ms.py +0 -0
  46. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/dataset.py +0 -0
  47. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/dataset_schema.py +0 -0
  48. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/__init__.py +0 -0
  49. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/builder.py +0 -0
  50. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/builder_factory.py +0 -0
  51. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/ms.py +0 -0
  52. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/ms_subtable.py +0 -0
  53. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/ratt_ms.py +0 -0
  54. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/register_default_builders.py +0 -0
  55. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/tests/test_builder_factory.py +0 -0
  56. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/tests/test_default_builder.py +0 -0
  57. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/tests/test_ms_builder.py +0 -0
  58. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/descriptors/tests/test_ms_subtable_builder.py +0 -0
  59. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/example_data.py +0 -0
  60. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/__init__.py +0 -0
  61. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/__init__.py +0 -0
  62. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/arrow_schema.py +0 -0
  63. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/extension_types.py +0 -0
  64. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/reads.py +0 -0
  65. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/require_arrow.py +0 -0
  66. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/tests/__init__.py +0 -0
  67. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/tests/test_extensions.py +0 -0
  68. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/arrow/writes.py +0 -0
  69. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/fragments/__init__.py +0 -0
  70. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/fragments/tests/__init__.py +0 -0
  71. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/fragments/tests/test_fragments.py +0 -0
  72. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/__init__.py +0 -0
  73. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/corr_products.py +0 -0
  74. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/meerkat_antennas.py +0 -0
  75. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/mock_dataset.py +0 -0
  76. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/tests/conftest.py +0 -0
  77. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/tests/test_chunkstore.py +0 -0
  78. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/transpose.py +0 -0
  79. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/katdal/uvw.py +0 -0
  80. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/tests/__init__.py +0 -0
  81. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/tests/test_utils.py +0 -0
  82. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/utils.py +0 -0
  83. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/zarr/__init__.py +0 -0
  84. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/zarr/tests/__init__.py +0 -0
  85. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/experimental/zarr/tests/conftest.py +0 -0
  86. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/expressions.py +0 -0
  87. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/fsspec_store.py +0 -0
  88. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/multiton.py +0 -0
  89. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/optimisation.py +0 -0
  90. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/ordering.py +0 -0
  91. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/patterns.py +0 -0
  92. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/query.py +0 -0
  93. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/reads.py +0 -0
  94. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/table.py +0 -0
  95. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/table_executor.py +0 -0
  96. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/table_proxy.py +0 -0
  97. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/table_schemas.py +0 -0
  98. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/testing.py +0 -0
  99. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/__init__.py +0 -0
  100. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_columns.py +0 -0
  101. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_dataset.py +0 -0
  102. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_dataset_keywords.py +0 -0
  103. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_dataset_schema.py +0 -0
  104. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_executor.py +0 -0
  105. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_expression.py +0 -0
  106. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_github.py +0 -0
  107. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_ms_creation.py +0 -0
  108. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_ms_read_and_update.py +0 -0
  109. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_multiton_metaclass.py +0 -0
  110. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_optimisation.py +0 -0
  111. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_optional.py +0 -0
  112. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_ordering.py +0 -0
  113. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_patterns.py +0 -0
  114. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_storage.py +0 -0
  115. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_stress.py +0 -0
  116. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_table.py +0 -0
  117. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_table_proxy.py +0 -0
  118. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_table_schemas.py +0 -0
  119. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/tests/test_utils.py +0 -0
  120. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/utils.py +0 -0
  121. {dask_ms-0.2.26 → dask_ms-0.2.28}/daskms/writes.py +0 -0
  122. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/Makefile +0 -0
  123. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/api.rst +0 -0
  124. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/authors.rst +0 -0
  125. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/concepts/ms.rst +0 -0
  126. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/concepts/pyarrays.rst +0 -0
  127. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/concepts.rst +0 -0
  128. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/conf.py +0 -0
  129. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/contributing.rst +0 -0
  130. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/history.rst +0 -0
  131. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/index.rst +0 -0
  132. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/installation.rst +0 -0
  133. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/make.bat +0 -0
  134. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/readme.rst +0 -0
  135. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/tutorial/datasets.rst +0 -0
  136. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/tutorial/reads.rst +0 -0
  137. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/tutorial/writes.rst +0 -0
  138. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/tutorial.rst +0 -0
  139. {dask_ms-0.2.26 → dask_ms-0.2.28}/docs/usage.rst +0 -0
  140. {dask_ms-0.2.26 → dask_ms-0.2.28}/examples/example.py +0 -0
  141. {dask_ms-0.2.26 → dask_ms-0.2.28}/examples/ms_subtable_join.py +0 -0
  142. {dask_ms-0.2.26 → dask_ms-0.2.28}/examples/sched_context.py +0 -0
  143. {dask_ms-0.2.26 → dask_ms-0.2.28}/readthedocs.yml +0 -0
@@ -50,7 +50,7 @@ jobs:
50
50
 
51
51
  - name: Cache Installations
52
52
  id: cache-installs
53
- uses: actions/cache@v4
53
+ uses: actions/cache@v5
54
54
  with:
55
55
  path: ~/.local
56
56
  key: install-${{ env.INSTALL_CACHE_HASH }}-2
@@ -69,7 +69,7 @@ jobs:
69
69
  run: minio --help
70
70
 
71
71
  - name: Checkout source
72
- uses: actions/checkout@v5
72
+ uses: actions/checkout@v6
73
73
  with:
74
74
  fetch-depth: 1
75
75
 
@@ -114,13 +114,13 @@ jobs:
114
114
 
115
115
  - name: Cache Installations
116
116
  id: cache-installs
117
- uses: actions/cache@v4
117
+ uses: actions/cache@v5
118
118
  with:
119
119
  path: ~/.local
120
120
  key: install-${{ env.INSTALL_CACHE_HASH }}-0
121
121
 
122
122
  - name: Checkout source
123
- uses: actions/checkout@v5
123
+ uses: actions/checkout@v6
124
124
  with:
125
125
  fetch-depth: 1
126
126
 
@@ -151,7 +151,7 @@ jobs:
151
151
  python-version: 3.11
152
152
 
153
153
  - name: Checkout source
154
- uses: actions/checkout@v5
154
+ uses: actions/checkout@v6
155
155
  with:
156
156
  fetch-depth: 1
157
157
 
@@ -6,7 +6,7 @@ jobs:
6
6
  pre-commit:
7
7
  runs-on: ubuntu-latest
8
8
  steps:
9
- - uses: actions/checkout@v5
9
+ - uses: actions/checkout@v6
10
10
  with:
11
11
  fetch-depth: 1
12
12
  - uses: actions/setup-python@v6
@@ -2,6 +2,18 @@
2
2
  History
3
3
  =======
4
4
 
5
+ 0.2.28 (2026-01-13)
6
+ -------------------
7
+ * Remove ``DATA_DESC_ID``, ``FIELD_ID`` and ``SCAN_NUMBER`` arrays that
8
+ were shadowing xarray dataset attributes (:pr:`366`)
9
+ * Add ``WEIGHT`` and ``SIGMA`` columns to katdal xarray datasets (:pr:`366`)
10
+ * Convert many of the subtables to lists of xarray datasets (:pr:`366`)
11
+
12
+ 0.2.27 (2025-11-26)
13
+ -------------------
14
+ * Propagate ``xds_from_katdal`` kwargs to ``katdal.open`` (:pr:`364`)
15
+ * Fix further changes of args to kwargs by the minio api (:pr:`363`)
16
+
5
17
  0.2.26 (2025-10-10)
6
18
  -------------------
7
19
  * Use trusted publishing (:pr:`359`)
@@ -9,7 +21,7 @@ History
9
21
  * Pass ``MinioAdmin.__init__`` arguments by kwarg (:pr:`358`)
10
22
 
11
23
  0.2.25 (2025-09-09)
12
- ------------------
24
+ -------------------
13
25
  * Support katdal data sources in xds_from_storage_ms (:pr:`353`, :pr:`355`, :pr:`356`)
14
26
 
15
27
  0.2.24 (2025-07-02)
@@ -18,13 +30,13 @@ History
18
30
  * Implement a cacheout-based multiton, implementing a TTL (:pr:`344`)
19
31
 
20
32
  0.2.23 (2024-11-11)
21
- ------------------
33
+ -------------------
22
34
  * Restrict dask \< 2024.11.0 (:pr:`341`)
23
35
  * Use github action to install poetry (:pr:`340`)
24
36
  * Update readthedocs version (:pr:`339`)
25
37
 
26
38
  0.2.22 (2024-11-07)
27
- ------------------
39
+ -------------------
28
40
  * Pin minimum version of katdal to 0.23 (:pr:`337`)
29
41
  * Pin minimum version of python-casacore to 3.6.1 (:pr:`337`)
30
42
  * Pin minimum version of NumPy to 2.0.0 (:pr:`337`)
@@ -34,7 +46,7 @@ History
34
46
  * Fix date typo in HISTORY.rst (:pr:`336`)
35
47
 
36
48
  0.2.21 (2024-06-18)
37
- ------------------
49
+ -------------------
38
50
  * Restrict NumPy to < 2.0.0 (:pr:`333`)
39
51
  * Bump donfig dependency to 0.8.0 due to install error with pip (:pr:`332`)
40
52
  * Fix katdal import typos (:pr:`331`)
@@ -57,7 +69,7 @@ History
57
69
  * Address warnings (:pr:`309`)
58
70
 
59
71
  0.2.20 (2024-01-30)
60
- ------------------
72
+ -------------------
61
73
  * Update calver dependencies to use inequality, rather than caret dependency specifiers (:pr:`307`)
62
74
  * Update pre-commit to actions/python@v5.0.0 (:pr:`308`)
63
75
  * Update readthedocs python version to 3.9 and poetry to 1.7.1 (:pr:`303`)
@@ -74,7 +86,7 @@ History
74
86
  * Temporarily add Pandas as an arrow extra dependency (:pr:`296`)
75
87
 
76
88
  0.2.18 (2023-09-20)
77
- ------------------
89
+ -------------------
78
90
  * Ignore non-existent columns (:pr:`290`)
79
91
  * Add experimental fragments functionality (:pr:`282`, :pr:`291`)
80
92
  * Add rechunk by size utility funtion (:pr:`284`)
@@ -83,11 +95,11 @@ History
83
95
  * Retain ROWID coordinates during MS conversion (:pr:`286`)
84
96
 
85
97
  0.2.17 (2023-08-02)
86
- ------------------
98
+ -------------------
87
99
  * Change setmaxcachesize to require a read lock, not a write lock (:pr:`281`)
88
100
 
89
101
  0.2.16 (2023-05-26)
90
- ------------------
102
+ -------------------
91
103
  * Update calver versioned software such as dask and xarray to 2023 variants (:pr:`279`)
92
104
  * Remove unused requirements_dev.txt (:pr:`275`)
93
105
  * Support optional CASA columns (:pr:`270`)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dask-ms
3
- Version: 0.2.26
3
+ Version: 0.2.28
4
4
  Summary: xarray Dataset from CASA Tables
5
5
  Author-email: Simon Perkins <simon.perkins@gmail.com>
6
6
  License-Expression: BSD-3-Clause
@@ -4,7 +4,7 @@ import logging
4
4
 
5
5
  __author__ = """Simon Perkins"""
6
6
  __email__ = "sperkins@ska.ac.za"
7
- __version__ = "0.2.26"
7
+ __version__ = "0.2.28"
8
8
 
9
9
  logging.getLogger(__name__).addHandler(logging.NullHandler())
10
10
 
@@ -337,7 +337,7 @@ def py_minio_client(minio_admin, minio_user_key):
337
337
  minio = pytest.importorskip("minio")
338
338
  parsed_url = urlparse(MINIO_URL)
339
339
  yield minio.Minio(
340
- parsed_url.netloc,
340
+ endpoint=parsed_url.netloc,
341
341
  access_key=minio_user_key,
342
342
  secret_key=minio_user_key,
343
343
  secure=False,
@@ -170,7 +170,7 @@ def test_xds_to_parquet_local(ms, tmp_path_factory, spw_table, ant_table):
170
170
  def test_xds_to_parquet_s3(
171
171
  ms, spw_table, ant_table, py_minio_client, minio_user_key, minio_url, s3_bucket_name
172
172
  ):
173
- py_minio_client.make_bucket(s3_bucket_name)
173
+ py_minio_client.make_bucket(bucket_name=s3_bucket_name)
174
174
 
175
175
  store = DaskMSStore(
176
176
  f"s3://{s3_bucket_name}/measurementset.MS",
@@ -29,9 +29,9 @@ class FacadeMultiton(metaclass=MultitonMetaclass):
29
29
 
30
30
  @staticmethod
31
31
  def from_args(
32
- url: str, applycal: str = "", no_auto: bool = True, chunks: dict = {}
32
+ url: str, applycal: str = "", no_auto: bool = True, chunks: dict = {}, **kw
33
33
  ):
34
- katdal_dataset = katdal.open(url, applycal=applycal)
34
+ katdal_dataset = katdal.open(url, applycal=applycal, **kw)
35
35
  return XArrayMSv2Facade(katdal_dataset, no_auto=no_auto, chunks=chunks)
36
36
 
37
37
 
@@ -69,15 +69,8 @@ def xds_from_katdal(
69
69
  f"url_or_dataset {type(url_or_dataset)} must be a str or Dataset"
70
70
  )
71
71
 
72
- if len(kwargs) > 0:
73
- warnings.warn(
74
- f"The following unsupported kwargs were ignored in "
75
- f"xds_from_katdal: {list(kwargs.keys())}",
76
- UserWarning,
77
- )
78
-
79
72
  facade = FacadeMultiton(
80
- FacadeMultiton.from_args, base_url, applycal, no_auto, chunks
73
+ FacadeMultiton.from_args, base_url, applycal, no_auto, chunks, **kwargs
81
74
  )
82
75
  main_xds, subtable_xds = facade.instance.xarray_datasets()
83
76
 
@@ -227,13 +227,10 @@ class XArrayMSv2Facade:
227
227
  "ANTENNA2": (primary_dims, ant2),
228
228
  "FEED1": (primary_dims, da.zeros_like(ant1)),
229
229
  "FEED2": (primary_dims, da.zeros_like(ant1)),
230
- "DATA_DESC_ID": (primary_dims, da.full_like(ant1, DATA_DESC_ID)),
231
- "FIELD_ID": (primary_dims, da.full_like(ant1, field_id)),
232
230
  "STATE_ID": (primary_dims, da.full_like(ant1, state_id)),
233
231
  "ARRAY_ID": (primary_dims, da.zeros_like(ant1)),
234
232
  "OBSERVATION_ID": (primary_dims, da.zeros_like(ant1)),
235
233
  "PROCESSOR_ID": (primary_dims, da.ones_like(ant1)),
236
- "SCAN_NUMBER": (primary_dims, da.full_like(ant1, scan_index)),
237
234
  "TIME_CENTROID": (primary_dims, time),
238
235
  "INTERVAL": (primary_dims, da.full_like(time, dataset.dump_period)),
239
236
  "EXPOSURE": (primary_dims, da.full_like(time, dataset.dump_period)),
@@ -244,6 +241,10 @@ class XArrayMSv2Facade:
244
241
  primary_dims + ("chan", "corr"),
245
242
  weights.dataset,
246
243
  ),
244
+ "WEIGHT": (
245
+ primary_dims + ("corr",),
246
+ da.mean(weights.dataset, axis=len(primary_dims)),
247
+ ),
247
248
  # Estimated RMS noise per frequency channel
248
249
  # note this column is used when computing calibration weights
249
250
  # in CASA - WEIGHT_SPECTRUM may be modified based on the
@@ -254,12 +255,14 @@ class XArrayMSv2Facade:
254
255
  primary_dims + ("chan", "corr"),
255
256
  weights.dataset**-0.5,
256
257
  ),
258
+ "SIGMA": (
259
+ primary_dims + ("corr",),
260
+ da.mean(weights.dataset**-0.5, axis=len(primary_dims)),
261
+ ),
257
262
  }
258
263
 
259
264
  attrs = {
260
- DASKMS_PARTITION_KEY: tuple(
261
- (c, data_vars[c][-1].dtype.name) for c in GROUP_COLS
262
- ),
265
+ DASKMS_PARTITION_KEY: tuple((c, "int32") for c in GROUP_COLS),
263
266
  "FIELD_ID": field_id,
264
267
  "DATA_DESC_ID": DATA_DESC_ID,
265
268
  "SCAN_NUMBER": scan_index,
@@ -272,24 +275,32 @@ class XArrayMSv2Facade:
272
275
  def _antenna_xarray_factory(self):
273
276
  antennas = self._dataset.ants
274
277
  nant = len(antennas)
275
- return xarray.Dataset(
276
- {
277
- "NAME": ("row", np.asarray([a.name for a in antennas], dtype=object)),
278
- "STATION": (
279
- "row",
280
- np.asarray([a.name for a in antennas], dtype=object),
281
- ),
282
- "POSITION": (
283
- ("row", "xyz"),
284
- np.asarray([a.position_ecef for a in antennas]),
285
- ),
286
- "OFFSET": (("row", "xyz"), np.zeros((nant, 3))),
287
- "DISH_DIAMETER": ("row", np.asarray([a.diameter for a in antennas])),
288
- "MOUNT": ("row", np.array(["ALT-AZ"] * nant, dtype=object)),
289
- "TYPE": ("row", np.array(["GROUND-BASED"] * nant, dtype=object)),
290
- "FLAG_ROW": ("row", np.zeros(nant, dtype=np.int32)),
291
- }
292
- )
278
+ return [
279
+ xarray.Dataset(
280
+ {
281
+ "NAME": (
282
+ "row",
283
+ np.asarray([a.name for a in antennas], dtype=object),
284
+ ),
285
+ "STATION": (
286
+ "row",
287
+ np.asarray([a.name for a in antennas], dtype=object),
288
+ ),
289
+ "POSITION": (
290
+ ("row", "xyz"),
291
+ np.asarray([a.position_ecef for a in antennas]),
292
+ ),
293
+ "OFFSET": (("row", "xyz"), np.zeros((nant, 3))),
294
+ "DISH_DIAMETER": (
295
+ "row",
296
+ np.asarray([a.diameter for a in antennas]),
297
+ ),
298
+ "MOUNT": ("row", np.array(["ALT-AZ"] * nant, dtype=object)),
299
+ "TYPE": ("row", np.array(["GROUND-BASED"] * nant, dtype=object)),
300
+ "FLAG_ROW": ("row", np.zeros(nant, dtype=np.int32)),
301
+ }
302
+ )
303
+ ]
293
304
 
294
305
  def _spw_xarray_factory(self):
295
306
  def ref_freq(chan_freqs):
@@ -335,84 +346,103 @@ class XArrayMSv2Facade:
335
346
  # MeerKAT only has linear feeds, these map to
336
347
  # CASA ["XX", "XY", "YX", "YY"]
337
348
  pol_types = {"HH": 9, "HV": 10, "VH": 11, "VV": 12}
338
- return xarray.Dataset(
339
- {
340
- "NUM_CORR": ("row", np.array([len(self._pols_to_use)], dtype=np.int32)),
341
- "CORR_PRODUCT": (
342
- ("row", "corr", "corrprod_idx"),
343
- np.array(
344
- [[[pol_num[p[0]], pol_num[p[1]]] for p in self._pols_to_use]],
345
- dtype=np.int32,
349
+ return [
350
+ xarray.Dataset(
351
+ {
352
+ "NUM_CORR": (
353
+ "row",
354
+ np.array([len(self._pols_to_use)], dtype=np.int32),
346
355
  ),
347
- ),
348
- "CORR_TYPE": (
349
- ("row", "corr"),
350
- np.asarray(
351
- [[pol_types[p] for p in self._pols_to_use]], dtype=np.int32
356
+ "CORR_PRODUCT": (
357
+ ("row", "corr", "corrprod_idx"),
358
+ np.array(
359
+ [
360
+ [
361
+ [pol_num[p[0]], pol_num[p[1]]]
362
+ for p in self._pols_to_use
363
+ ]
364
+ ],
365
+ dtype=np.int32,
366
+ ),
352
367
  ),
353
- ),
354
- "FLAG_ROW": ("row", np.zeros(1, dtype=np.int32)),
355
- }
356
- )
368
+ "CORR_TYPE": (
369
+ ("row", "corr"),
370
+ np.asarray(
371
+ [[pol_types[p] for p in self._pols_to_use]], dtype=np.int32
372
+ ),
373
+ ),
374
+ "FLAG_ROW": ("row", np.zeros(1, dtype=np.int32)),
375
+ }
376
+ )
377
+ ]
357
378
 
358
379
  def _ddid_xarray_factory(self):
359
- return xarray.Dataset(
360
- {
361
- "SPECTRAL_WINDOW_ID": ("row", np.zeros(1, dtype=np.int32)),
362
- "POLARIZATION_ID": ("row", np.zeros(1, dtype=np.int32)),
363
- "FLAG_ROW": ("row", np.zeros(1, dtype=np.int32)),
364
- }
365
- )
380
+ return [
381
+ xarray.Dataset(
382
+ {
383
+ "SPECTRAL_WINDOW_ID": ("row", np.zeros(1, dtype=np.int32)),
384
+ "POLARIZATION_ID": ("row", np.zeros(1, dtype=np.int32)),
385
+ "FLAG_ROW": ("row", np.zeros(1, dtype=np.int32)),
386
+ }
387
+ )
388
+ ]
366
389
 
367
390
  def _feed_xarray_factory(self):
368
391
  nfeeds = len(self._dataset.ants)
369
392
  NRECEPTORS = 2
370
393
 
371
- return xarray.Dataset(
372
- {
373
- # ID of antenna in this array (integer)
374
- "ANTENNA_ID": ("row", np.arange(nfeeds, dtype=np.int32)),
375
- # Id for BEAM model (integer)
376
- "BEAM_ID": ("row", np.ones(nfeeds, dtype=np.int32)),
377
- # Beam position offset (on sky but in antenna reference frame): (double, 2-dim)
378
- "BEAM_OFFSET": (
379
- ("row", "receptors", "radec"),
380
- np.zeros((nfeeds, 2, 2), dtype=np.float64),
381
- ),
382
- # Feed id (integer)
383
- "FEED_ID": ("row", np.zeros(nfeeds, dtype=np.int32)),
384
- # Interval for which this set of parameters is accurate (double)
385
- "INTERVAL": ("row", np.zeros(nfeeds, dtype=np.float64)),
386
- # Number of receptors on this feed (probably 1 or 2) (integer)
387
- "NUM_RECEPTORS": ("row", np.full(nfeeds, NRECEPTORS, dtype=np.int32)),
388
- # Type of polarisation to which a given RECEPTOR responds (string, 1-dim)
389
- "POLARIZATION_TYPE": (
390
- ("row", "receptors"),
391
- np.array([["X", "Y"]] * nfeeds, dtype=object),
392
- ),
393
- # D-matrix i.e. leakage between two receptors (complex, 2-dim)
394
- "POL_RESPONSE": (
395
- ("row", "receptors", "receptors-2"),
396
- np.array([np.eye(2, dtype=np.complex64) for _ in range(nfeeds)]),
397
- ),
398
- # Position of feed relative to feed reference position (double, 1-dim, shape=(3,))
399
- "POSITION": (("row", "xyz"), np.zeros((nfeeds, 3), np.float64)),
400
- # The reference angle for polarisation (double, 1-dim). A parallactic angle of
401
- # 0 means that V is aligned to x (celestial North), but we are mapping H to x
402
- # so we have to correct with a -90 degree rotation.
403
- "RECEPTOR_ANGLE": (
404
- ("row", "receptors"),
405
- np.full((nfeeds, NRECEPTORS), -np.pi / 2, dtype=np.float64),
406
- ),
407
- # ID for this spectral window setup (integer)
408
- "SPECTRAL_WINDOW_ID": ("row", np.full(nfeeds, -1, dtype=np.int32)),
409
- # Midpoint of time for which this set of parameters is accurate (double)
410
- "TIME": ("row", np.zeros(nfeeds, dtype=np.float64)),
411
- }
412
- )
394
+ return [
395
+ xarray.Dataset(
396
+ {
397
+ # ID of antenna in this array (integer)
398
+ "ANTENNA_ID": ("row", np.arange(nfeeds, dtype=np.int32)),
399
+ # Id for BEAM model (integer)
400
+ "BEAM_ID": ("row", np.ones(nfeeds, dtype=np.int32)),
401
+ # Beam position offset (on sky but in antenna reference frame): (double, 2-dim)
402
+ "BEAM_OFFSET": (
403
+ ("row", "receptors", "radec"),
404
+ np.zeros((nfeeds, 2, 2), dtype=np.float64),
405
+ ),
406
+ # Feed id (integer)
407
+ "FEED_ID": ("row", np.zeros(nfeeds, dtype=np.int32)),
408
+ # Interval for which this set of parameters is accurate (double)
409
+ "INTERVAL": ("row", np.zeros(nfeeds, dtype=np.float64)),
410
+ # Number of receptors on this feed (probably 1 or 2) (integer)
411
+ "NUM_RECEPTORS": (
412
+ "row",
413
+ np.full(nfeeds, NRECEPTORS, dtype=np.int32),
414
+ ),
415
+ # Type of polarisation to which a given RECEPTOR responds (string, 1-dim)
416
+ "POLARIZATION_TYPE": (
417
+ ("row", "receptors"),
418
+ np.array([["X", "Y"]] * nfeeds, dtype=object),
419
+ ),
420
+ # D-matrix i.e. leakage between two receptors (complex, 2-dim)
421
+ "POL_RESPONSE": (
422
+ ("row", "receptors", "receptors-2"),
423
+ np.array(
424
+ [np.eye(2, dtype=np.complex64) for _ in range(nfeeds)]
425
+ ),
426
+ ),
427
+ # Position of feed relative to feed reference position (double, 1-dim, shape=(3,))
428
+ "POSITION": (("row", "xyz"), np.zeros((nfeeds, 3), np.float64)),
429
+ # The reference angle for polarisation (double, 1-dim). A parallactic angle of
430
+ # 0 means that V is aligned to x (celestial North), but we are mapping H to x
431
+ # so we have to correct with a -90 degree rotation.
432
+ "RECEPTOR_ANGLE": (
433
+ ("row", "receptors"),
434
+ np.full((nfeeds, NRECEPTORS), -np.pi / 2, dtype=np.float64),
435
+ ),
436
+ # ID for this spectral window setup (integer)
437
+ "SPECTRAL_WINDOW_ID": ("row", np.full(nfeeds, -1, dtype=np.int32)),
438
+ # Midpoint of time for which this set of parameters is accurate (double)
439
+ "TIME": ("row", np.zeros(nfeeds, dtype=np.float64)),
440
+ }
441
+ )
442
+ ]
413
443
 
414
444
  def _field_xarray_factory(self, field_data):
415
- fields = [
445
+ return [
416
446
  xarray.Dataset(
417
447
  {
418
448
  "NAME": ("row", np.array([target.name], object)),
@@ -438,64 +468,71 @@ class XArrayMSv2Facade:
438
468
  for field_id, time, target, radec in field_data.values()
439
469
  ]
440
470
 
441
- return xarray.concat(fields, dim="row")
442
-
443
471
  def _source_xarray_factory(self, field_data):
444
472
  field_ids, times, targets, radecs = zip(*(field_data.values()))
445
473
  times = np.array(times, dtype=np.float64)
446
474
  nfields = len(field_ids)
447
- return xarray.Dataset(
448
- {
449
- "NAME": ("row", np.array([t.name for t in targets], dtype=object)),
450
- "SOURCE_ID": ("row", np.array(field_ids, dtype=np.int32)),
451
- "PROPER_MOTION": (
452
- ("row", "radec-per-sec"),
453
- np.zeros((nfields, 2), dtype=np.float32),
454
- ),
455
- "CALIBRATION_GROUP": ("row", np.full(nfields, -1, dtype=np.int32)),
456
- "DIRECTION": (("row", "radec"), np.array(radecs)),
457
- "TIME": ("row", times),
458
- "NUM_LINES": ("row", np.ones(nfields, dtype=np.int32)),
459
- "REST_FREQUENCY": (
460
- ("row", "lines"),
461
- np.zeros((nfields, 1), dtype=np.float64),
462
- ),
463
- }
464
- )
475
+ return [
476
+ xarray.Dataset(
477
+ {
478
+ "NAME": ("row", np.array([t.name for t in targets], dtype=object)),
479
+ "SOURCE_ID": ("row", np.array(field_ids, dtype=np.int32)),
480
+ "PROPER_MOTION": (
481
+ ("row", "radec-per-sec"),
482
+ np.zeros((nfields, 2), dtype=np.float32),
483
+ ),
484
+ "CALIBRATION_GROUP": ("row", np.full(nfields, -1, dtype=np.int32)),
485
+ "DIRECTION": (("row", "radec"), np.array(radecs)),
486
+ "TIME": ("row", times),
487
+ "NUM_LINES": ("row", np.ones(nfields, dtype=np.int32)),
488
+ "REST_FREQUENCY": (
489
+ ("row", "lines"),
490
+ np.zeros((nfields, 1), dtype=np.float64),
491
+ ),
492
+ }
493
+ )
494
+ ]
465
495
 
466
496
  def _state_xarray_factory(self, state_modes):
467
497
  state_ids, modes = zip(*sorted((i, m) for m, i in state_modes.items()))
468
498
  nstates = len(state_ids)
469
- return xarray.Dataset(
470
- {
471
- "SIG": np.ones(nstates, dtype=np.uint8),
472
- "REF": np.zeros(nstates, dtype=np.uint8),
473
- "CAL": np.zeros(nstates, dtype=np.float64),
474
- "LOAD": np.zeros(nstates, dtype=np.float64),
475
- "SUB_SCAN": np.zeros(nstates, dtype=np.int32),
476
- "OBS_MODE": np.array(modes, dtype=object),
477
- "FLAG_ROW": np.zeros(nstates, dtype=np.int32),
478
- }
479
- )
499
+ return [
500
+ xarray.Dataset(
501
+ {
502
+ "SIG": np.ones(nstates, dtype=np.uint8),
503
+ "REF": np.zeros(nstates, dtype=np.uint8),
504
+ "CAL": np.zeros(nstates, dtype=np.float64),
505
+ "LOAD": np.zeros(nstates, dtype=np.float64),
506
+ "SUB_SCAN": np.zeros(nstates, dtype=np.int32),
507
+ "OBS_MODE": np.array(modes, dtype=object),
508
+ "FLAG_ROW": np.zeros(nstates, dtype=np.int32),
509
+ }
510
+ )
511
+ ]
480
512
 
481
513
  def _observation_xarray_factory(self):
482
514
  ds = self._dataset
483
515
  start, end = [to_mjds(t) for t in [ds.start_time, ds.end_time]]
484
- return xarray.Dataset(
485
- {
486
- "OBSERVER": ("row", np.array([ds.observer], dtype=object)),
487
- "PROJECT": ("row", np.array([ds.experiment_id], dtype=object)),
488
- "LOG": (("row", "extra"), np.array([["unavailable"]], dtype=object)),
489
- "SCHEDULE": (
490
- ("row", "extra"),
491
- np.array([["unavailable"]], dtype=object),
492
- ),
493
- "SCHEDULE_TYPE": ("row", np.array(["unknown"], dtype=object)),
494
- "TELESCOPE": ("row", np.array(["MeerKAT"], dtype=object)),
495
- "TIME_RANGE": (("row", "extent"), np.array([[start, end]])),
496
- "FLAG_ROW": ("row", np.zeros(1, np.uint8)),
497
- }
498
- )
516
+ return [
517
+ xarray.Dataset(
518
+ {
519
+ "OBSERVER": ("row", np.array([ds.observer], dtype=object)),
520
+ "PROJECT": ("row", np.array([ds.experiment_id], dtype=object)),
521
+ "LOG": (
522
+ ("row", "extra"),
523
+ np.array([["unavailable"]], dtype=object),
524
+ ),
525
+ "SCHEDULE": (
526
+ ("row", "extra"),
527
+ np.array([["unavailable"]], dtype=object),
528
+ ),
529
+ "SCHEDULE_TYPE": ("row", np.array(["unknown"], dtype=object)),
530
+ "TELESCOPE_NAME": ("row", np.array(["MeerKAT"], dtype=object)),
531
+ "TIME_RANGE": (("row", "extent"), np.array([[start, end]])),
532
+ "FLAG_ROW": ("row", np.zeros(1, np.uint8)),
533
+ }
534
+ )
535
+ ]
499
536
 
500
537
  def xarray_datasets(self):
501
538
  """Generates partitions of the main MSv2 table, as well as the subtables.
@@ -185,7 +185,7 @@ def test_xds_to_zarr_local(ms, spw_table, ant_table, tmp_path_factory):
185
185
  def test_xds_to_zarr_s3(
186
186
  ms, spw_table, ant_table, py_minio_client, minio_user_key, minio_url, s3_bucket_name
187
187
  ):
188
- py_minio_client.make_bucket(s3_bucket_name)
188
+ py_minio_client.make_bucket(bucket_name=s3_bucket_name)
189
189
 
190
190
  zarr_store = DaskMSStore(
191
191
  f"s3://{s3_bucket_name}/measurementset.MS",
@@ -107,8 +107,10 @@ def test_minio_server(
107
107
  stuff = tmp_path / "stuff.txt"
108
108
  stuff.write_text(payload)
109
109
 
110
- py_minio_client.make_bucket(s3_bucket_name)
111
- py_minio_client.fput_object(s3_bucket_name, "stuff.txt", str(stuff))
110
+ py_minio_client.make_bucket(bucket_name=s3_bucket_name)
111
+ py_minio_client.fput_object(
112
+ bucket_name=s3_bucket_name, object_name="stuff.txt", file_path=str(stuff)
113
+ )
112
114
 
113
115
  s3 = s3fs.S3FileSystem(
114
116
  key=minio_user_key,
@@ -130,12 +132,12 @@ def test_storage_options_from_config(
130
132
  ):
131
133
  filename = "test.txt"
132
134
  payload = "How now brown cow"
133
- py_minio_client.make_bucket(s3_bucket_name)
135
+ py_minio_client.make_bucket(bucket_name=s3_bucket_name)
134
136
  py_minio_client.put_object(
135
- s3_bucket_name,
136
- f"subdir/{filename}",
137
- BytesIO(payload.encode("utf-8")),
138
- len(payload),
137
+ bucket_name=s3_bucket_name,
138
+ object_name=f"subdir/{filename}",
139
+ data=BytesIO(payload.encode("utf-8")),
140
+ length=len(payload),
139
141
  )
140
142
 
141
143
  url = f"s3://{s3_bucket_name}"
@@ -3,7 +3,7 @@
3
3
  name = "dask-ms"
4
4
  description = "xarray Dataset from CASA Tables"
5
5
  license = "BSD-3-Clause"
6
- version = "0.2.26"
6
+ version = "0.2.28"
7
7
  readme = "README.rst"
8
8
  authors = [{name = "Simon Perkins", email = "simon.perkins@gmail.com"}]
9
9
  requires-python = '>=3.10,<3.14'
@@ -2,7 +2,7 @@
2
2
  github_url = "https://github.com/ratt-ru/dask-ms"
3
3
 
4
4
  [version]
5
- current = "0.2.26"
5
+ current = "0.2.28"
6
6
 
7
7
  # Example of a semver regexp.
8
8
  # Make sure this matches current_version before
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes