cloudoll 2.2.31__tar.gz → 2.2.33__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 (44) hide show
  1. {cloudoll-2.2.31 → cloudoll-2.2.33}/PKG-INFO +2 -1
  2. cloudoll-2.2.33/cloudoll/__init__.py +1 -0
  3. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/settings.py +5 -3
  4. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/PKG-INFO +2 -1
  5. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/requires.txt +1 -0
  6. {cloudoll-2.2.31 → cloudoll-2.2.33}/setup.py +2 -1
  7. cloudoll-2.2.31/cloudoll/__init__.py +0 -1
  8. {cloudoll-2.2.31 → cloudoll-2.2.33}/LICENSE +0 -0
  9. {cloudoll-2.2.31 → cloudoll-2.2.33}/README.md +0 -0
  10. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/__main__.py +0 -0
  11. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/cli.py +0 -0
  12. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/error/__init__.py +0 -0
  13. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/error/errors.py +0 -0
  14. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/logging/__init__.py +0 -0
  15. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/mail/__init__.py +0 -0
  16. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/mail/smtp.py +0 -0
  17. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/__init__.py +0 -0
  18. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/base.py +0 -0
  19. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/err.py +0 -0
  20. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/field.py +0 -0
  21. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/model.py +0 -0
  22. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/mysql.py +0 -0
  23. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/parse.py +0 -0
  24. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/postgres.py +0 -0
  25. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/robot/__init__.py +0 -0
  26. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/robot/dingtalk.py +0 -0
  27. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/robot/feishu.py +0 -0
  28. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/robot/slack.py +0 -0
  29. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/utils/__init__.py +0 -0
  30. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/utils/common.py +0 -0
  31. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/utils/m2d.py +0 -0
  32. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/utils/patch_loop.py +0 -0
  33. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/utils/snowflake.py +0 -0
  34. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/utils/watch.py +0 -0
  35. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/__init__.py +0 -0
  36. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/exception.py +0 -0
  37. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/html.py +0 -0
  38. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/http.py +0 -0
  39. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/jwt.py +0 -0
  40. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/SOURCES.txt +0 -0
  41. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/dependency_links.txt +0 -0
  42. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/entry_points.txt +0 -0
  43. {cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/top_level.txt +0 -0
  44. {cloudoll-2.2.31 → cloudoll-2.2.33}/setup.cfg +0 -0
{cloudoll-2.2.31 → cloudoll-2.2.33}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloudoll
3
- Version: 2.2.31
3
+ Version: 2.2.33
4
4
  Summary: 辅助快速创建可分布的微服务。
5
5
  Home-page: https://gitee.com/chuchur/cloudoll-py
6
6
  Author: chuchur
@@ -28,6 +28,7 @@ Requires-Dist: pyjwt
28
28
  Requires-Dist: aiohttp_session[secure]
29
29
  Requires-Dist: PyYAML
30
30
  Requires-Dist: click
31
+ Requires-Dist: envyaml
31
32
 
32
33
 
33
34
  # cloudoll 云端玩具
cloudoll-2.2.33/cloudoll/__init__.py ADDED
@@ -0,0 +1 @@
1
+ __version__ = "2.2.33"
{cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/settings.py RENAMED
@@ -1,6 +1,7 @@
1
- import yaml
1
+ # import yaml
2
2
  import os
3
3
  from ..logging import print_error, print_info
4
+ from envyaml import EnvYAML
4
5
 
5
6
 
6
7
  def get_config(env):
@@ -11,6 +12,7 @@ def get_config(env):
11
12
  if not os.path.exists(conf_path):
12
13
  print_error(f"Configuration file does not exist: {conf_path}")
13
14
  return {}
14
- with open(conf_path, "r", encoding="utf-8") as f:
15
- config = yaml.safe_load(f)
15
+ # with open(conf_path, "r", encoding="utf-8") as f:
16
+ # config = yaml.safe_load(f)
17
+ config = EnvYAML(conf_path)
16
18
  return config or {}
{cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloudoll
3
- Version: 2.2.31
3
+ Version: 2.2.33
4
4
  Summary: 辅助快速创建可分布的微服务。
5
5
  Home-page: https://gitee.com/chuchur/cloudoll-py
6
6
  Author: chuchur
@@ -28,6 +28,7 @@ Requires-Dist: pyjwt
28
28
  Requires-Dist: aiohttp_session[secure]
29
29
  Requires-Dist: PyYAML
30
30
  Requires-Dist: click
31
+ Requires-Dist: envyaml
31
32
 
32
33
 
33
34
  # cloudoll 云端玩具
{cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll.egg-info/requires.txt RENAMED
@@ -11,3 +11,4 @@ pyjwt
11
11
  aiohttp_session[secure]
12
12
  PyYAML
13
13
  click
14
+ envyaml
{cloudoll-2.2.31 → cloudoll-2.2.33}/setup.py RENAMED
@@ -36,7 +36,8 @@ REQUIRED = [
36
36
  "pyjwt",
37
37
  "aiohttp_session[secure]",
38
38
  "PyYAML",
39
- "click"
39
+ "click",
40
+ "envyaml"
40
41
  ]
41
42
 
42
43
  # What packages are optional?
cloudoll-2.2.31/cloudoll/__init__.py DELETED
@@ -1 +0,0 @@
1
- __version__ = "2.2.31"
{cloudoll-2.2.31 → cloudoll-2.2.33}/LICENSE RENAMED
File without changes
{cloudoll-2.2.31 → cloudoll-2.2.33}/README.md RENAMED
File without changes
{cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/cli.py RENAMED
File without changes
{cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/orm/err.py RENAMED
File without changes
{cloudoll-2.2.31 → cloudoll-2.2.33}/cloudoll/web/jwt.py RENAMED
File without changes
{cloudoll-2.2.31 → cloudoll-2.2.33}/setup.cfg RENAMED
File without changes