Skip to content

Commit 2b0bc32

Browse files
authored
Merge pull request #388 from devsetgo/dev
Reorganizing Library Structure
2 parents 5803bbd + b67999c commit 2b0bc32

File tree

67 files changed

+481
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+481
-243
lines changed

.bumpversion.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.11.2
2+
current_version = 0.11.2-beta0
33
commit = False
44
tag = False
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>[a-z]+)(?P<num>\d+))?
@@ -12,6 +12,8 @@ optional_value = alpha
1212
values =
1313
alpha
1414
beta
15-
gamma
15+
pre-release
1616

1717
[bumpversion:file:pyproject.toml]
18+
19+
[bumpversion:file:dsg_lib/__init__.py]

.devcontainer/devcontainer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
},
4040
// Add the IDs of extensions you want installed when the container is created.
4141
"extensions": [
42+
// "usernamehw.errorlens",
43+
"streetsidesoftware.code-spell-checker",
4244
"GitHub.copilot",
4345
"GitHub.copilot-chat",
4446
"ms-vscode.cpptools-extension-pack",

.github/workflows/pythonpublish.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Upload Python Package
22

33
on:
4+
workflow_dispatch:
45
release:
56
types: [published]
67
jobs:
@@ -23,3 +24,6 @@ jobs:
2324
run: |
2425
python -m build
2526
twine upload dist/*
27+
28+
# pypa/gh-action-pypi-publish@v1.8.11
29+

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ Published Date: 2023 April 08, 21:45
342342
# ChatGPT
343343
Using [ChatGPT](https://chat.openai.com/) to improve tests, find bugs, and improve performance. Code coverage is at 100% and the code base appears to be performing better than before.
344344

345-
Major changes are in PR #304
345+
Major changes are in PR #304
346346

347347
# What's Changed
348348
* latest change fix for regex pattern. (#307) @devsetgo

coverage.xml

Lines changed: 97 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" ?>
2-
<coverage version="7.4.0" timestamp="1705727026306" lines-valid="595" lines-covered="595" line-rate="1" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
3-
<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.4.0 -->
2+
<coverage version="7.4.1" timestamp="1707617356425" lines-valid="596" lines-covered="596" line-rate="1" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
3+
<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.4.1 -->
44
<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
55
<sources>
66
<source>/github/workspace</source>
@@ -9,17 +9,20 @@
99
<package name="dsg_lib" line-rate="1" branch-rate="0" complexity="0">
1010
<classes>
1111
<class name="__init__.py" filename="dsg_lib/__init__.py" complexity="0" line-rate="1" branch-rate="0">
12-
<methods/>
13-
<lines/>
14-
</class>
15-
<class name="_all_codes.py" filename="dsg_lib/_all_codes.py" complexity="0" line-rate="1" branch-rate="0">
1612
<methods/>
1713
<lines>
18-
<line number="2" hits="1"/>
19-
<line number="29" hits="1"/>
14+
<line number="3" hits="1"/>
2015
</lines>
2116
</class>
22-
<class name="async_database.py" filename="dsg_lib/async_database.py" complexity="0" line-rate="1" branch-rate="0">
17+
</classes>
18+
</package>
19+
<package name="dsg_lib.async_database_functions" line-rate="1" branch-rate="0" complexity="0">
20+
<classes>
21+
<class name="__init__.py" filename="dsg_lib/async_database_functions/__init__.py" complexity="0" line-rate="1" branch-rate="0">
22+
<methods/>
23+
<lines/>
24+
</class>
25+
<class name="async_database.py" filename="dsg_lib/async_database_functions/async_database.py" complexity="0" line-rate="1" branch-rate="0">
2326
<methods/>
2427
<lines>
2528
<line number="2" hits="1"/>
@@ -42,7 +45,7 @@
4245
<line number="87" hits="1"/>
4346
</lines>
4447
</class>
45-
<class name="base_schema.py" filename="dsg_lib/base_schema.py" complexity="0" line-rate="1" branch-rate="0">
48+
<class name="base_schema.py" filename="dsg_lib/async_database_functions/base_schema.py" complexity="0" line-rate="1" branch-rate="0">
4649
<methods/>
4750
<lines>
4851
<line number="2" hits="1"/>
@@ -56,36 +59,7 @@
5659
<line number="131" hits="1"/>
5760
</lines>
5861
</class>
59-
<class name="calendar_functions.py" filename="dsg_lib/calendar_functions.py" complexity="0" line-rate="1" branch-rate="0">
60-
<methods/>
61-
<lines>
62-
<line number="2" hits="1"/>
63-
<line number="40" hits="1"/>
64-
<line number="43" hits="1"/>
65-
<line number="59" hits="1"/>
66-
<line number="75" hits="1"/>
67-
<line number="76" hits="1"/>
68-
<line number="79" hits="1"/>
69-
<line number="80" hits="1"/>
70-
<line number="81" hits="1"/>
71-
<line number="84" hits="1"/>
72-
<line number="85" hits="1"/>
73-
<line number="86" hits="1"/>
74-
<line number="88" hits="1"/>
75-
<line number="91" hits="1"/>
76-
<line number="94" hits="1"/>
77-
<line number="107" hits="1"/>
78-
<line number="123" hits="1"/>
79-
<line number="124" hits="1"/>
80-
<line number="125" hits="1"/>
81-
<line number="128" hits="1"/>
82-
<line number="131" hits="1"/>
83-
<line number="132" hits="1"/>
84-
<line number="134" hits="1"/>
85-
<line number="135" hits="1"/>
86-
</lines>
87-
</class>
88-
<class name="database_config.py" filename="dsg_lib/database_config.py" complexity="0" line-rate="1" branch-rate="0">
62+
<class name="database_config.py" filename="dsg_lib/async_database_functions/database_config.py" complexity="0" line-rate="1" branch-rate="0">
8963
<methods/>
9064
<lines>
9165
<line number="39" hits="1"/>
@@ -115,7 +89,7 @@
11589
<line number="281" hits="1"/>
11690
</lines>
11791
</class>
118-
<class name="database_operations.py" filename="dsg_lib/database_operations.py" complexity="0" line-rate="1" branch-rate="0">
92+
<class name="database_operations.py" filename="dsg_lib/async_database_functions/database_operations.py" complexity="0" line-rate="1" branch-rate="0">
11993
<methods/>
12094
<lines>
12195
<line number="2" hits="1"/>
@@ -302,7 +276,44 @@
302276
<line number="1006" hits="1"/>
303277
</lines>
304278
</class>
305-
<class name="file_functions.py" filename="dsg_lib/file_functions.py" complexity="0" line-rate="1" branch-rate="0">
279+
</classes>
280+
</package>
281+
<package name="dsg_lib.common_functions" line-rate="1" branch-rate="0" complexity="0">
282+
<classes>
283+
<class name="__init__.py" filename="dsg_lib/common_functions/__init__.py" complexity="0" line-rate="1" branch-rate="0">
284+
<methods/>
285+
<lines/>
286+
</class>
287+
<class name="calendar_functions.py" filename="dsg_lib/common_functions/calendar_functions.py" complexity="0" line-rate="1" branch-rate="0">
288+
<methods/>
289+
<lines>
290+
<line number="2" hits="1"/>
291+
<line number="40" hits="1"/>
292+
<line number="43" hits="1"/>
293+
<line number="59" hits="1"/>
294+
<line number="75" hits="1"/>
295+
<line number="76" hits="1"/>
296+
<line number="79" hits="1"/>
297+
<line number="80" hits="1"/>
298+
<line number="81" hits="1"/>
299+
<line number="84" hits="1"/>
300+
<line number="85" hits="1"/>
301+
<line number="86" hits="1"/>
302+
<line number="88" hits="1"/>
303+
<line number="91" hits="1"/>
304+
<line number="94" hits="1"/>
305+
<line number="107" hits="1"/>
306+
<line number="123" hits="1"/>
307+
<line number="124" hits="1"/>
308+
<line number="125" hits="1"/>
309+
<line number="128" hits="1"/>
310+
<line number="131" hits="1"/>
311+
<line number="132" hits="1"/>
312+
<line number="134" hits="1"/>
313+
<line number="135" hits="1"/>
314+
</lines>
315+
</class>
316+
<class name="file_functions.py" filename="dsg_lib/common_functions/file_functions.py" complexity="0" line-rate="1" branch-rate="0">
306317
<methods/>
307318
<lines>
308319
<line number="2" hits="1"/>
@@ -474,7 +485,7 @@
474485
<line number="599" hits="1"/>
475486
</lines>
476487
</class>
477-
<class name="folder_functions.py" filename="dsg_lib/folder_functions.py" complexity="0" line-rate="1" branch-rate="0">
488+
<class name="folder_functions.py" filename="dsg_lib/common_functions/folder_functions.py" complexity="0" line-rate="1" branch-rate="0">
478489
<methods/>
479490
<lines>
480491
<line number="2" hits="1"/>
@@ -530,32 +541,7 @@
530541
<line number="203" hits="1"/>
531542
</lines>
532543
</class>
533-
<class name="http_codes.py" filename="dsg_lib/http_codes.py" complexity="0" line-rate="1" branch-rate="0">
534-
<methods/>
535-
<lines>
536-
<line number="2" hits="1"/>
537-
<line number="21" hits="1"/>
538-
<line number="23" hits="1"/>
539-
<line number="36" hits="1"/>
540-
<line number="74" hits="1"/>
541-
<line number="76" hits="1"/>
542-
<line number="81" hits="1"/>
543-
<line number="88" hits="1"/>
544-
<line number="93" hits="1"/>
545-
<line number="97" hits="1"/>
546-
<line number="102" hits="1"/>
547-
<line number="104" hits="1"/>
548-
<line number="117" hits="1"/>
549-
<line number="118" hits="1"/>
550-
<line number="132" hits="1"/>
551-
<line number="133" hits="1"/>
552-
<line number="146" hits="1"/>
553-
<line number="147" hits="1"/>
554-
<line number="161" hits="1"/>
555-
<line number="162" hits="1"/>
556-
</lines>
557-
</class>
558-
<class name="logging_config.py" filename="dsg_lib/logging_config.py" complexity="0" line-rate="1" branch-rate="0">
544+
<class name="logging_config.py" filename="dsg_lib/common_functions/logging_config.py" complexity="0" line-rate="1" branch-rate="0">
559545
<methods/>
560546
<lines>
561547
<line number="2" hits="1"/>
@@ -591,7 +577,7 @@
591577
<line number="176" hits="1"/>
592578
</lines>
593579
</class>
594-
<class name="patterns.py" filename="dsg_lib/patterns.py" complexity="0" line-rate="1" branch-rate="0">
580+
<class name="patterns.py" filename="dsg_lib/common_functions/patterns.py" complexity="0" line-rate="1" branch-rate="0">
595581
<methods/>
596582
<lines>
597583
<line number="2" hits="1"/>
@@ -614,7 +600,47 @@
614600
<line number="133" hits="1"/>
615601
</lines>
616602
</class>
617-
<class name="system_health_endpoints.py" filename="dsg_lib/system_health_endpoints.py" complexity="0" line-rate="1" branch-rate="0">
603+
</classes>
604+
</package>
605+
<package name="dsg_lib.fastapi_functions" line-rate="1" branch-rate="0" complexity="0">
606+
<classes>
607+
<class name="__init__.py" filename="dsg_lib/fastapi_functions/__init__.py" complexity="0" line-rate="1" branch-rate="0">
608+
<methods/>
609+
<lines/>
610+
</class>
611+
<class name="_all_codes.py" filename="dsg_lib/fastapi_functions/_all_codes.py" complexity="0" line-rate="1" branch-rate="0">
612+
<methods/>
613+
<lines>
614+
<line number="2" hits="1"/>
615+
<line number="29" hits="1"/>
616+
</lines>
617+
</class>
618+
<class name="http_codes.py" filename="dsg_lib/fastapi_functions/http_codes.py" complexity="0" line-rate="1" branch-rate="0">
619+
<methods/>
620+
<lines>
621+
<line number="2" hits="1"/>
622+
<line number="21" hits="1"/>
623+
<line number="23" hits="1"/>
624+
<line number="36" hits="1"/>
625+
<line number="74" hits="1"/>
626+
<line number="76" hits="1"/>
627+
<line number="81" hits="1"/>
628+
<line number="88" hits="1"/>
629+
<line number="93" hits="1"/>
630+
<line number="97" hits="1"/>
631+
<line number="102" hits="1"/>
632+
<line number="104" hits="1"/>
633+
<line number="117" hits="1"/>
634+
<line number="118" hits="1"/>
635+
<line number="132" hits="1"/>
636+
<line number="133" hits="1"/>
637+
<line number="146" hits="1"/>
638+
<line number="147" hits="1"/>
639+
<line number="161" hits="1"/>
640+
<line number="162" hits="1"/>
641+
</lines>
642+
</class>
643+
<class name="system_health_endpoints.py" filename="dsg_lib/fastapi_functions/system_health_endpoints.py" complexity="0" line-rate="1" branch-rate="0">
618644
<methods/>
619645
<lines>
620646
<line number="2" hits="1"/>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Reference
2+
3+
::: src.common_functions.calendar_functions
4+
handler: python
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Reference
2+
3+
::: src.common_functions.file_functions
4+
handler: python
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Reference
2+
3+
::: src.common_functions.folder_functions
4+
handler: python

docs/common_functions/logging.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Reference
2+
3+
::: src.common_functions.logging_config
4+
handler: python

docs/common_functions/regex.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Reference
2+
3+
::: src.common_functions.patterns
4+
handler: python

0 commit comments

Comments
 (0)