casaconfig 0.0.89__tar.gz → 0.0.91__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 (36) hide show
  1. {casaconfig-0.0.89/casaconfig.egg-info → casaconfig-0.0.91}/PKG-INFO +1 -1
  2. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/measures_update.py +0 -1
  3. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/pull_data.py +14 -8
  4. {casaconfig-0.0.89 → casaconfig-0.0.91/casaconfig.egg-info}/PKG-INFO +1 -1
  5. {casaconfig-0.0.89 → casaconfig-0.0.91}/setup.py +1 -1
  6. {casaconfig-0.0.89 → casaconfig-0.0.91}/LICENSE +0 -0
  7. {casaconfig-0.0.89 → casaconfig-0.0.91}/MANIFEST.in +0 -0
  8. {casaconfig-0.0.89 → casaconfig-0.0.91}/README.md +0 -0
  9. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/__init__.py +0 -0
  10. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/__main__.py +0 -0
  11. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/config.py +0 -0
  12. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/CasaconfigErrors.py +0 -0
  13. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/__init__.py +0 -0
  14. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/casasiteconfig_example.py +0 -0
  15. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/config_defaults.py +0 -0
  16. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/config_defaults_static.py +0 -0
  17. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/data_available.py +0 -0
  18. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/data_update.py +0 -0
  19. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/do_auto_updates.py +0 -0
  20. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/do_pull_data.py +0 -0
  21. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/get_argparser.py +0 -0
  22. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/get_config.py +0 -0
  23. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/get_data_info.py +0 -0
  24. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/get_data_lock.py +0 -0
  25. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/io_redirect.py +0 -0
  26. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/measures_available.py +0 -0
  27. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/print_log_messages.py +0 -0
  28. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/read_readme.py +0 -0
  29. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/set_casacore_path.py +0 -0
  30. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/summary.py +0 -0
  31. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig/private/update_all.py +0 -0
  32. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig.egg-info/SOURCES.txt +0 -0
  33. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig.egg-info/dependency_links.txt +0 -0
  34. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig.egg-info/requires.txt +0 -0
  35. {casaconfig-0.0.89 → casaconfig-0.0.91}/casaconfig.egg-info/top_level.txt +0 -0
  36. {casaconfig-0.0.89 → casaconfig-0.0.91}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: casaconfig
3
- Version: 0.0.89
3
+ Version: 0.0.91
4
4
  Summary: CASA Operational Configuration Package
5
5
  Home-page: https://github.com/casangi/casaconfig
6
6
  Author: National Radio Astronomy Observatory
@@ -149,7 +149,6 @@ def measures_update(path=None, version=None, force=False, logger=None, auto_upda
149
149
  from .. import config as _config
150
150
  path = _config.measurespath
151
151
 
152
- print("casaconfig.measures_update path = %s" % path)
153
152
  if path is None:
154
153
  raise UnsetMeasurespath('measures_update: path is None and has not been set in config.measurespath. Provide a valid path and retry.')
155
154
 
@@ -182,12 +182,13 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
182
182
 
183
183
  # a pull will happen, unless the version string is not available
184
184
 
185
- if available_data is None:
186
- # this may raise a RemoteError, no need to catch that here but it may need to be caught upstream
187
- available_data = data_available()
188
-
189
185
  if version is None:
190
186
  # need a version, use most recent available
187
+
188
+ if available_data is None:
189
+ # this may raise a RemoteError, no need to catch that here but it may need to be caught upstream
190
+ available_data = data_available()
191
+
191
192
  version = available_data[-1]
192
193
 
193
194
  expectedMeasuresVersion = None
@@ -199,10 +200,15 @@ def pull_data(path=None, version=None, force=False, logger=None, verbose=None):
199
200
  return
200
201
  version = releaseInfo['casarundata']
201
202
  expectedMeasuresVersion = releaseInfo['measures']
202
-
203
- if version not in available_data:
204
- print_log_messages('version %s not found on CASA server, use casaconfig.data_available() for a list of casarundata versions' % version, logger, True)
205
- return
203
+ else:
204
+ # requested version must be available
205
+ if available_data is None:
206
+ # this may raise a RemoteError, no need to catch that here but it may need to be caught upstream
207
+ available_data = data_available()
208
+
209
+ if version not in available_data:
210
+ print_log_messages('version %s not found on CASA server, use casaconfig.data_available() for a list of casarundata versions' % version, logger, True)
211
+ return
206
212
 
207
213
  if not os.path.exists(path):
208
214
  # make dirs all the way down path if possible
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: casaconfig
3
- Version: 0.0.89
3
+ Version: 0.0.91
4
4
  Summary: CASA Operational Configuration Package
5
5
  Home-page: https://github.com/casangi/casaconfig
6
6
  Author: National Radio Astronomy Observatory
@@ -6,7 +6,7 @@ with open('README.md', "r") as fid: #encoding='utf-8'
6
6
 
7
7
  setup(
8
8
  name='casaconfig',
9
- version='0.0.89',
9
+ version='0.0.91',
10
10
  description='CASA Operational Configuration Package',
11
11
  long_description=long_description,
12
12
  long_description_content_type="text/markdown",
File without changes
File without changes
File without changes
File without changes