hutch-python 1.23.0__tar.gz → 1.23.1__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 (147) hide show
  1. hutch_python-1.23.1/.github/CODEOWNERS +14 -0
  2. {hutch_python-1.23.0 → hutch_python-1.23.1}/PKG-INFO +1 -1
  3. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/releases.rst +18 -0
  4. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/_version.py +2 -2
  5. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/epics_arch.py +1 -1
  6. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_cli.py +17 -8
  7. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python.egg-info/PKG-INFO +1 -1
  8. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python.egg-info/SOURCES.txt +1 -0
  9. {hutch_python-1.23.0 → hutch_python-1.23.1}/.coveragerc +0 -0
  10. {hutch_python-1.23.0 → hutch_python-1.23.1}/.flake8 +0 -0
  11. {hutch_python-1.23.0 → hutch_python-1.23.1}/.git_archival.txt +0 -0
  12. {hutch_python-1.23.0 → hutch_python-1.23.1}/.gitattributes +0 -0
  13. {hutch_python-1.23.0 → hutch_python-1.23.1}/.github/ISSUE_TEMPLATE.md +0 -0
  14. {hutch_python-1.23.0 → hutch_python-1.23.1}/.github/PULL_REQUEST_TEMPLATE.md +0 -0
  15. {hutch_python-1.23.0 → hutch_python-1.23.1}/.github/workflows/standard.yml +0 -0
  16. {hutch_python-1.23.0 → hutch_python-1.23.1}/.gitignore +0 -0
  17. {hutch_python-1.23.0 → hutch_python-1.23.1}/.landscape.yml +0 -0
  18. {hutch_python-1.23.0 → hutch_python-1.23.1}/.pre-commit-config.yaml +0 -0
  19. {hutch_python-1.23.0 → hutch_python-1.23.1}/AUTHORS.rst +0 -0
  20. {hutch_python-1.23.0 → hutch_python-1.23.1}/CONTRIBUTING.rst +0 -0
  21. {hutch_python-1.23.0 → hutch_python-1.23.1}/LICENSE +0 -0
  22. {hutch_python-1.23.0 → hutch_python-1.23.1}/MANIFEST.in +0 -0
  23. {hutch_python-1.23.0 → hutch_python-1.23.1}/README.rst +0 -0
  24. {hutch_python-1.23.0 → hutch_python-1.23.1}/bin/hutch-python +0 -0
  25. {hutch_python-1.23.0 → hutch_python-1.23.1}/conda-recipe/meta.yaml +0 -0
  26. {hutch_python-1.23.0 → hutch_python-1.23.1}/dev-requirements.txt +0 -0
  27. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/Makefile +0 -0
  28. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/hutch_python.ipynb +0 -0
  29. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/pre-release-notes.sh +0 -0
  30. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/release_notes.py +0 -0
  31. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/beamline.rst +0 -0
  32. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/bug.rst +0 -0
  33. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/cache.rst +0 -0
  34. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/cli.rst +0 -0
  35. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/conf.py +0 -0
  36. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/daq.rst +0 -0
  37. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/database.rst +0 -0
  38. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/debug.rst +0 -0
  39. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/environment.rst +0 -0
  40. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/experiment.rst +0 -0
  41. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/hutch_setup.rst +0 -0
  42. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/index.rst +0 -0
  43. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/ipython_log.rst +0 -0
  44. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/load_conf.rst +0 -0
  45. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/load_parts.rst +0 -0
  46. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/log_setup.rst +0 -0
  47. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/namespace.rst +0 -0
  48. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/object_configuration.rst +0 -0
  49. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/other_modules.rst +0 -0
  50. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/presets.rst +0 -0
  51. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/report.rst +0 -0
  52. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/start.rst +0 -0
  53. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/startup.rst +0 -0
  54. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/tips.rst +0 -0
  55. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/tutorial.ipynb +0 -0
  56. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/upcoming_release_notes/template-full.rst +0 -0
  57. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/upcoming_release_notes/template-short.rst +0 -0
  58. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/user_utils.rst +0 -0
  59. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/utils.rst +0 -0
  60. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs/source/yaml_files.rst +0 -0
  61. {hutch_python-1.23.0 → hutch_python-1.23.1}/docs-requirements.txt +0 -0
  62. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/__init__.py +0 -0
  63. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/__main__.py +0 -0
  64. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/bug.py +0 -0
  65. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cache.py +0 -0
  66. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/calc_defaults.py +0 -0
  67. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cam_load.py +0 -0
  68. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cli.py +0 -0
  69. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/constants.py +0 -0
  70. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/cookiecutter.json +0 -0
  71. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/.gitignore +0 -0
  72. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/README.md +0 -0
  73. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/conf.yml +0 -0
  74. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/experiments/__init__.py +0 -0
  75. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/set-dev +0 -0
  76. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/{{ cookiecutter.hutch }}/__init__.py +0 -0
  77. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/{{ cookiecutter.hutch }}/beamline.py +0 -0
  78. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/{{ cookiecutter.hutch }}env +0 -0
  79. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/cookiecutter/{{ cookiecutter.hutch }}/{{ cookiecutter.hutch }}python +0 -0
  80. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/debug.py +0 -0
  81. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/env_version.py +0 -0
  82. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/exp_load.py +0 -0
  83. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/happi.py +0 -0
  84. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/ipython_log.py +0 -0
  85. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/ipython_session_timer.py +0 -0
  86. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/lcls.py +0 -0
  87. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/load_conf.py +0 -0
  88. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/log_setup.py +0 -0
  89. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/logging.yml +0 -0
  90. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/mpl_config.py +0 -0
  91. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/namespace.py +0 -0
  92. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/obj_config.py +0 -0
  93. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/ophyd_settings.py +0 -0
  94. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/options.py +0 -0
  95. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/plan_defaults.py +0 -0
  96. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/plan_wrappers.py +0 -0
  97. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/print_hint_banner.py +0 -0
  98. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/pt_app_config.py +0 -0
  99. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/qs_load.py +0 -0
  100. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/sim.py +0 -0
  101. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/startup_script.py +0 -0
  102. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/templates/issue.template +0 -0
  103. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/__init__.py +0 -0
  104. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/bad_script.py +0 -0
  105. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/camviewer.cfg +0 -0
  106. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/conf.yaml +0 -0
  107. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/conftest.py +0 -0
  108. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/envs/pcds-1.0.0 +0 -0
  109. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/envs/pcds-2.0.0 +0 -0
  110. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/envs/z-env +0 -0
  111. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/experiments/sample_expname.py +0 -0
  112. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/experiments/x010.py +0 -0
  113. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/experiments/x011.py +0 -0
  114. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/happi_db.json +0 -0
  115. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/sample_module_1.py +0 -0
  116. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/sample_module_2.py +0 -0
  117. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/script.py +0 -0
  118. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_bug.py +0 -0
  119. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_cache.py +0 -0
  120. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_cam_load.py +0 -0
  121. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_epics_arch.py +0 -0
  122. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_experiment.py +0 -0
  123. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_happi.py +0 -0
  124. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_ipython_log.py +0 -0
  125. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_ipython_session_timer.py +0 -0
  126. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_load_conf.py +0 -0
  127. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_log_setup.py +0 -0
  128. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_namespace.py +0 -0
  129. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_obj_config.py +0 -0
  130. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_plan_wrappers.py +0 -0
  131. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_questionnaire.py +0 -0
  132. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_tstpython.py +0 -0
  133. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_user_load.py +0 -0
  134. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/test_utils.py +0 -0
  135. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/tst/__init__.py +0 -0
  136. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/tst/beamline.py +0 -0
  137. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/tests/tstpython +0 -0
  138. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/user_load.py +0 -0
  139. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/utils.py +0 -0
  140. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python/version.py +0 -0
  141. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python.egg-info/dependency_links.txt +0 -0
  142. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python.egg-info/entry_points.txt +0 -0
  143. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python.egg-info/requires.txt +0 -0
  144. {hutch_python-1.23.0 → hutch_python-1.23.1}/hutch_python.egg-info/top_level.txt +0 -0
  145. {hutch_python-1.23.0 → hutch_python-1.23.1}/pyproject.toml +0 -0
  146. {hutch_python-1.23.0 → hutch_python-1.23.1}/requirements.txt +0 -0
  147. {hutch_python-1.23.0 → hutch_python-1.23.1}/setup.cfg +0 -0
@@ -0,0 +1,14 @@
1
+ # default group
2
+ * @pcdshub/python-reviewers
3
+
4
+ # language-specific group(s)
5
+ ## PYTHON files
6
+ *.py @pcdshub/python-reviewers
7
+ *.pyi @pcdshub/python-reviewers
8
+ *.pyc @pcdshub/python-reviewers
9
+ *.pyw @pcdshub/python-reviewers
10
+ *.pyx @pcdshub/python-reviewers
11
+ *.pyd @pcdshub/python-reviewers
12
+
13
+ # github folder holds administrative files
14
+ .github/** @pcdshub/software-admin
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: hutch-python
3
- Version: 1.23.0
3
+ Version: 1.23.1
4
4
  Summary: Launcher and Config Reader for LCLS Interactive IPython Sessions
5
5
  Author: SLAC National Accelerator Laboratory
6
6
  License: Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior
@@ -2,6 +2,24 @@ Release History
2
2
  ###############
3
3
 
4
4
 
5
+ v1.23.1 (2025-05-14)
6
+ ====================
7
+
8
+ Bugfixes
9
+ --------
10
+ - Fixed pathcheck in hutch_python/epics_arch.py:create_softlink
11
+
12
+ Maintenance
13
+ -----------
14
+ - Separate test_hist_file_arg into three separate test cases to hopefully alleviate test suite timeout issues
15
+
16
+ Contributors
17
+ ------------
18
+ - tangkong
19
+ - vespos
20
+
21
+
22
+
5
23
  v1.23.0 (2025-04-07)
6
24
  ====================
7
25
 
@@ -17,5 +17,5 @@ __version__: str
17
17
  __version_tuple__: VERSION_TUPLE
18
18
  version_tuple: VERSION_TUPLE
19
19
 
20
- __version__ = version = '1.23.0'
21
- __version_tuple__ = version_tuple = (1, 23, 0)
20
+ __version__ = version = '1.23.1'
21
+ __version_tuple__ = version_tuple = (1, 23, 1)
@@ -310,7 +310,7 @@ def create_softlink(experiment, link_path):
310
310
  overwrites it with the new active experiment.
311
311
  """
312
312
  # Defaults new softlink in /cds/group/pcds/dist/pds/{}/misc/
313
- if not os.path.exists(link_path):
313
+ if not os.path.exists(link_path.format(experiment[0:3])):
314
314
  raise OSError('Path does not exist path: %s' % link_path)
315
315
 
316
316
  subprocess.run(['ln', '-sf', link_path.format(experiment[0:3]) + 'epicsArch_'
@@ -75,6 +75,7 @@ def test_create_arg():
75
75
  if test_dir.exists():
76
76
  shutil.rmtree(test_dir)
77
77
 
78
+ # Needs manual confirmation if we run with capture output on...
78
79
  with cli_args(['hutch_python', '--create', hutch]):
79
80
  with restore_logging():
80
81
  main()
@@ -96,11 +97,9 @@ def run_hpy_and_exit(*args: str) -> subprocess.CompletedProcess:
96
97
 
97
98
 
98
99
  @pytest.mark.timeout(30)
99
- def test_hist_file_arg(monkeypatch):
100
+ def test_hist_file_arg():
100
101
  logger.debug("test_hist_file_arg")
101
102
  test_hist_file = (CFG_PATH.parent / "history.sqlite").resolve()
102
- bad_hist_file = (CFG_PATH.parent / "aesefiudh" / "history.sqlite").resolve()
103
- memory_hist_filename = ":memory:"
104
103
 
105
104
  # Test that the sqlite file gets made
106
105
  # First, need to remove the file if it already exists
@@ -113,17 +112,27 @@ def test_hist_file_arg(monkeypatch):
113
112
  assert test_hist_file.exists()
114
113
  # Remove the file for future tests
115
114
  test_hist_file.unlink()
116
- # With the bad hist file we should still run ok with just a warning
117
- run_hpy_and_exit("--hist-file", str(bad_hist_file))
118
115
  assert not test_hist_file.exists()
119
- # Same with the in-memory choice
120
- run_hpy_and_exit("--hist-file", memory_hist_filename)
116
+
117
+
118
+ @pytest.mark.timeout(30)
119
+ @pytest.mark.parametrize("filepath,", (
120
+ (CFG_PATH.parent / "aesefiudh" / "history.sqlite").resolve(),
121
+ ":memory:",
122
+ ))
123
+ def test_no_hist_file(filepath):
124
+ # With the bad hist file or memory we should still run ok with just a warning
125
+ test_hist_file = (CFG_PATH.parent / "history.sqlite").resolve()
126
+ run_hpy_and_exit("--hist-file", str(filepath))
121
127
  assert not test_hist_file.exists()
122
128
 
129
+
130
+ @pytest.mark.timeout(30)
131
+ def test_template_file(monkeypatch):
123
132
  # Exercise the template + check default usage
124
133
  # We can't actually write to the default default in a test context
125
134
  # But we can check what the config would be
126
- new_default = str(test_hist_file.parent / "${USER}-history.sqlite")
135
+ new_default = str(CFG_PATH.parent / "${USER}-history.sqlite")
127
136
  new_default_filled = Template(new_default).substitute({"USER": os.environ["USER"]})
128
137
  monkeypatch.setattr(
129
138
  hutch_python.cli,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: hutch-python
3
- Version: 1.23.0
3
+ Version: 1.23.1
4
4
  Summary: Launcher and Config Reader for LCLS Interactive IPython Sessions
5
5
  Author: SLAC National Accelerator Laboratory
6
6
  License: Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior
@@ -14,6 +14,7 @@ dev-requirements.txt
14
14
  docs-requirements.txt
15
15
  pyproject.toml
16
16
  requirements.txt
17
+ .github/CODEOWNERS
17
18
  .github/ISSUE_TEMPLATE.md
18
19
  .github/PULL_REQUEST_TEMPLATE.md
19
20
  .github/workflows/standard.yml
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes