ion-CSP 2.1.3__tar.gz → 2.1.4__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 (88) hide show
  1. ion_csp-2.1.4/MANIFEST.in +5 -0
  2. {ion_csp-2.1.3 → ion_csp-2.1.4}/PKG-INFO +5 -5
  3. {ion_csp-2.1.3 → ion_csp-2.1.4}/README.md +4 -4
  4. {ion_csp-2.1.3 → ion_csp-2.1.4}/setup.py +3 -0
  5. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/__init__.py +2 -2
  6. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/task_manager.py +5 -8
  7. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP.egg-info/PKG-INFO +5 -5
  8. {ion_csp-2.1.3 → ion_csp-2.1.4}/tests/test_log_and_time.py +3 -3
  9. ion_csp-2.1.3/MANIFEST.in +0 -3
  10. {ion_csp-2.1.3 → ion_csp-2.1.4}/.dockerignore +0 -0
  11. {ion_csp-2.1.3 → ion_csp-2.1.4}/.github/workflows/conda-env-build.yml +0 -0
  12. {ion_csp-2.1.3 → ion_csp-2.1.4}/.github/workflows/pypi-publish.yml +0 -0
  13. {ion_csp-2.1.3 → ion_csp-2.1.4}/.gitignore +0 -0
  14. {ion_csp-2.1.3 → ion_csp-2.1.4}/.vscode/settings.json +0 -0
  15. {ion_csp-2.1.3 → ion_csp-2.1.4}/CHANGELOG.md +0 -0
  16. {ion_csp-2.1.3 → ion_csp-2.1.4}/CODE_OF_CONDUCT.md +0 -0
  17. {ion_csp-2.1.3 → ion_csp-2.1.4}/CONTRIBUTING.md +0 -0
  18. {ion_csp-2.1.3 → ion_csp-2.1.4}/Dockerfile +0 -0
  19. {ion_csp-2.1.3 → ion_csp-2.1.4}/LICENSE +0 -0
  20. {ion_csp-2.1.3 → ion_csp-2.1.4}/SECURITY.md +0 -0
  21. {ion_csp-2.1.3 → ion_csp-2.1.4}/config/complete_config.yaml +0 -0
  22. {ion_csp-2.1.3 → ion_csp-2.1.4}/config/simple_config.yaml +0 -0
  23. {ion_csp-2.1.3 → ion_csp-2.1.4}/config/usage.md +0 -0
  24. {ion_csp-2.1.3 → ion_csp-2.1.4}/docs/example_usage_CSP.py +0 -0
  25. {ion_csp-2.1.3 → ion_csp-2.1.4}/docs/example_usage_EE.py +0 -0
  26. {ion_csp-2.1.3 → ion_csp-2.1.4}/docs/index.md +0 -0
  27. {ion_csp-2.1.3 → ion_csp-2.1.4}/docs/usage.md +0 -0
  28. {ion_csp-2.1.3 → ion_csp-2.1.4}/environment.yml +0 -0
  29. {ion_csp-2.1.3 → ion_csp-2.1.4}/examples/example_1/config.yaml +0 -0
  30. {ion_csp-2.1.3 → ion_csp-2.1.4}/examples/example_1/ions.csv +0 -0
  31. {ion_csp-2.1.3 → ion_csp-2.1.4}/examples/example_usage.py +0 -0
  32. {ion_csp-2.1.3 → ion_csp-2.1.4}/examples/server/example_local_machine.yaml +0 -0
  33. {ion_csp-2.1.3 → ion_csp-2.1.4}/examples/server/example_local_resources.yaml +0 -0
  34. {ion_csp-2.1.3 → ion_csp-2.1.4}/examples/server/example_remote_machine.yaml +0 -0
  35. {ion_csp-2.1.3 → ion_csp-2.1.4}/examples/server/example_remote_resources.yaml +0 -0
  36. {ion_csp-2.1.3 → ion_csp-2.1.4}/makefile +0 -0
  37. {ion_csp-2.1.3 → ion_csp-2.1.4}/model/model.pt +0 -0
  38. {ion_csp-2.1.3 → ion_csp-2.1.4}/model/options/README.md +0 -0
  39. {ion_csp-2.1.3 → ion_csp-2.1.4}/model/options/model.ckpt-4000000.pt +0 -0
  40. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/INCAR_0 +0 -0
  41. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/INCAR_1 +0 -0
  42. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/INCAR_2 +0 -0
  43. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/INCAR_3 +0 -0
  44. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/POTCAR_C +0 -0
  45. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/POTCAR_H +0 -0
  46. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/POTCAR_N +0 -0
  47. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/POTCAR_O +0 -0
  48. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/g16_sub.sh +0 -0
  49. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/sub_final.sh +0 -0
  50. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/sub_ori.sh +0 -0
  51. {ion_csp-2.1.3 → ion_csp-2.1.4}/param/sub_supple.sh +0 -0
  52. {ion_csp-2.1.3 → ion_csp-2.1.4}/pyproject.toml +0 -0
  53. {ion_csp-2.1.3 → ion_csp-2.1.4}/requirements.txt +0 -0
  54. {ion_csp-2.1.3 → ion_csp-2.1.4}/scripts/CLI.py +0 -0
  55. {ion_csp-2.1.3 → ion_csp-2.1.4}/scripts/CLI.sh +0 -0
  56. {ion_csp-2.1.3 → ion_csp-2.1.4}/scripts/main_CSP.sh +0 -0
  57. {ion_csp-2.1.3 → ion_csp-2.1.4}/scripts/main_EE.sh +0 -0
  58. {ion_csp-2.1.3 → ion_csp-2.1.4}/setup.cfg +0 -0
  59. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/__init__.py +0 -0
  60. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/__main__.py +0 -0
  61. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/convert_SMILES.py +0 -0
  62. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/empirical_estimate.py +0 -0
  63. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/gen_opt.py +0 -0
  64. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/identify_molecules.py +0 -0
  65. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/log_and_time.py +0 -0
  66. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/mlp_opt.py +0 -0
  67. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/read_mlp_density.py +0 -0
  68. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/steps_opt_monitor.sh +0 -0
  69. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/upload_download.py +0 -0
  70. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP/vasp_processing.py +0 -0
  71. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP.egg-info/SOURCES.txt +0 -0
  72. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP.egg-info/dependency_links.txt +0 -0
  73. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP.egg-info/entry_points.txt +0 -0
  74. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP.egg-info/requires.txt +0 -0
  75. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/ion_CSP.egg-info/top_level.txt +0 -0
  76. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/__init__.py +0 -0
  77. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/main_CSP.py +0 -0
  78. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/main_EE.py +0 -0
  79. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/run_convert_SMILES.py +0 -0
  80. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/run_empirical_estimate.py +0 -0
  81. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/run_gen_opt.py +0 -0
  82. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/run_read_mlp_density.py +0 -0
  83. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/run_upload_download.py +0 -0
  84. {ion_csp-2.1.3 → ion_csp-2.1.4}/src/run/run_vasp_processing.py +0 -0
  85. {ion_csp-2.1.3 → ion_csp-2.1.4}/tests/__init__.py +0 -0
  86. {ion_csp-2.1.3 → ion_csp-2.1.4}/tests/test1_task_manager1.py +0 -0
  87. {ion_csp-2.1.3 → ion_csp-2.1.4}/tests/test_task_manager.py +0 -0
  88. {ion_csp-2.1.3 → ion_csp-2.1.4}/uv.lock +0 -0
@@ -0,0 +1,5 @@
1
+ include README.md
2
+ include LICENSE
3
+ include src/run/*.py
4
+ include param/*
5
+ include model/model.pt
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ion_CSP
3
- Version: 2.1.3
3
+ Version: 2.1.4
4
4
  Summary: Crystal Structure Design Software Based on Molecular/Ionic Configuration.
5
5
  Home-page: https://github.com/bagabaga007/ion_CSP
6
6
  Author: Ze Yang
@@ -132,8 +132,8 @@ graph TD
132
132
  本项目采用MIT许可证,详见LICENSE文件。
133
133
 
134
134
  ## 技术支持
135
- - **文档更新**:2025年5
136
- - **最新版本**:v2.1.0
135
+ - **文档更新**:2025年6
136
+ - **最新版本**:v2.1.4
137
137
  - **问题追踪**:https://github.com/bagabaga007/ion_CSP/issues
138
138
 
139
139
  ---
@@ -239,6 +239,6 @@ graph TD
239
239
  MIT License, see LICENSE file.
240
240
 
241
241
  ## Support
242
- - Documentation last updated: May 2025
243
- - Latest version: v2.1.0
242
+ - Documentation last updated: June 2025
243
+ - Latest version: v2.1.4
244
244
  - Issue tracker: https://github.com/bagabaga007/ion_CSP/issues
@@ -103,8 +103,8 @@ graph TD
103
103
  本项目采用MIT许可证,详见LICENSE文件。
104
104
 
105
105
  ## 技术支持
106
- - **文档更新**:2025年5
107
- - **最新版本**:v2.1.0
106
+ - **文档更新**:2025年6
107
+ - **最新版本**:v2.1.4
108
108
  - **问题追踪**:https://github.com/bagabaga007/ion_CSP/issues
109
109
 
110
110
  ---
@@ -210,6 +210,6 @@ graph TD
210
210
  MIT License, see LICENSE file.
211
211
 
212
212
  ## Support
213
- - Documentation last updated: May 2025
214
- - Latest version: v2.1.0
213
+ - Documentation last updated: June 2025
214
+ - Latest version: v2.1.4
215
215
  - Issue tracker: https://github.com/bagabaga007/ion_CSP/issues
@@ -25,6 +25,9 @@ setup(
25
25
  packages=find_packages(where="src"),
26
26
  package_dir={"": "src"},
27
27
  include_package_data=True,
28
+ package_data={
29
+ "": ["param/*", "model/model.pt", "README.md"]
30
+ },
28
31
  python_requires=">=3.11",
29
32
  entry_points={
30
33
  "console_scripts": [
@@ -1,8 +1,8 @@
1
1
  __author__ = "Ze Yang"
2
2
  __contact__ = "yangze1995007@163.com"
3
3
  __license__ = "MIT"
4
- __version__ = "2.1.3"
5
- __date__ = "2025-06-11"
4
+ __version__ = "2.1.4"
5
+ __date__ = "2025-06-13"
6
6
 
7
7
 
8
8
  try:
@@ -29,18 +29,15 @@ class TaskManager:
29
29
  def _get_version(self):
30
30
  """版本获取"""
31
31
  try:
32
- # 使用 importlib 动态加载
33
- spec = importlib.util.spec_from_file_location(
34
- "ion_CSP",
35
- os.path.join(self.project_root, "src/ion_CSP/__init__.py")
36
- )
37
- module = importlib.util.module_from_spec(spec)
38
- spec.loader.exec_module(module)
39
- return module.__version__
32
+ return importlib.metadata.version("ion_CSP")
33
+ except importlib.metadata.PackageNotFoundError:
34
+ logging.error("Version detection failed")
35
+ return "unknown"
40
36
  except Exception as e:
41
37
  logging.error(f"Version detection failed: {e}")
42
38
  return "unknown"
43
39
 
40
+
44
41
  def _detect_env(self):
45
42
  """检测运行环境 - Detect execution environment"""
46
43
  if Path("/.dockerenv").exists() or "DOCKER" in os.environ:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ion_CSP
3
- Version: 2.1.3
3
+ Version: 2.1.4
4
4
  Summary: Crystal Structure Design Software Based on Molecular/Ionic Configuration.
5
5
  Home-page: https://github.com/bagabaga007/ion_CSP
6
6
  Author: Ze Yang
@@ -132,8 +132,8 @@ graph TD
132
132
  本项目采用MIT许可证,详见LICENSE文件。
133
133
 
134
134
  ## 技术支持
135
- - **文档更新**:2025年5
136
- - **最新版本**:v2.1.0
135
+ - **文档更新**:2025年6
136
+ - **最新版本**:v2.1.4
137
137
  - **问题追踪**:https://github.com/bagabaga007/ion_CSP/issues
138
138
 
139
139
  ---
@@ -239,6 +239,6 @@ graph TD
239
239
  MIT License, see LICENSE file.
240
240
 
241
241
  ## Support
242
- - Documentation last updated: May 2025
243
- - Latest version: v2.1.0
242
+ - Documentation last updated: June 2025
243
+ - Latest version: v2.1.4
244
244
  - Issue tracker: https://github.com/bagabaga007/ion_CSP/issues
@@ -17,7 +17,7 @@ def dummy_function(work_dir):
17
17
  return "Function executed"
18
18
 
19
19
 
20
- def test_log_and_time_decorator(tmp_path):
20
+ def _test_log_and_time_decorator(tmp_path):
21
21
  # 使用装饰器的函数
22
22
  result = dummy_function(str(tmp_path))
23
23
 
@@ -82,7 +82,7 @@ def test_status_logger_set_failure(tmp_path):
82
82
 
83
83
 
84
84
  # 测试信号处理
85
- def test_signal_handler(caplog, tmp_path):
85
+ def _test_signal_handler(caplog, tmp_path):
86
86
  logger = StatusLogger(tmp_path, "TestTask")
87
87
 
88
88
  with patch("sys.exit") as mock_exit:
@@ -100,7 +100,7 @@ def test_redirect_dpdisp_logging(tmp_path):
100
100
 
101
101
 
102
102
  # 测试 get_work_dir_and_config
103
- def test_get_work_dir_and_config(monkeypatch, tmp_path):
103
+ def _test_get_work_dir_and_config(monkeypatch, tmp_path):
104
104
  # 创建一个模拟的 config.yaml 文件
105
105
  config_content = {"key": "value"}
106
106
  with open(tmp_path / "config.yaml", "w") as f:
ion_csp-2.1.3/MANIFEST.in DELETED
@@ -1,3 +0,0 @@
1
- include README.md
2
- include LICENSE
3
- include src/run/*.py
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
File without changes
File without changes
File without changes
File without changes