Skip to content

Commit e7e405e

Browse files
nanocode38nanocode38
committed
Merge branch 'develop'
<2025.7.16> Version 2.6.0 - Feat: pyhelper.tkhelper.RetMode - Feat: pyhelper.tkhelper.shake_window - Feat: pyhelper.tkhelper.window_sleep - Feat: pyhelper.tkhelper.password_window - Feat: pyhelper.tkhelper.center_window - Feat: pyhelper.tkhelper.setting_password_window - Update: E-mail in AUTHORS.md and Source file - Refactor: images in README.md and images in Website -> assets directory - Deleted: All description class files in pyhelper main package - Refactor: Move the import statement about pywin32 inside the function for packaging - Docs: Modify all document strings using Google format and Add missing documents - Test: Add pyhelper.tkhelper doctests - Fix: Cycle introduction problem in pyhelper.gamehelpers and pyhelper.gamehelpers.pghelper.widgets - Fix: pyhelper.random.sample() and pyhelper.random.shuffle() can 't use dependency parameters Date: Wed Jul 16 14:36:27 2025 +0800 Changes to be committed: modified: .gitignore deleted: .pre-commit-config.yaml modified: AUTHORS.md modified: HISTORY.md modified: README.md deleted: Web/icon.ico deleted: Web/icon_small.ico modified: Web/index.html modified: Web/styles.css new file: assets/LOGO.png renamed: img.png -> assets/img.png renamed: img_1.png -> assets/img_1.png new file: dist/pythonhelper-2.6.0-py3-none-any.whl deleted: main.py deleted: pyhelper/AUTHORS.md deleted: pyhelper/CODE_OF_CONDUCT.md deleted: pyhelper/HISTORY.md deleted: pyhelper/LICENSE deleted: pyhelper/README-chinese.md deleted: pyhelper/README.md modified: pyhelper/__init__.py modified: pyhelper/color.py modified: pyhelper/gamehelpers/__init__.py modified: pyhelper/gamehelpers/pghelper/__init__.py modified: pyhelper/gamehelpers/pghelper/widgets.py deleted: pyhelper/img.png deleted: pyhelper/img_1.png modified: pyhelper/mathhelper.py modified: pyhelper/random.py deleted: pyhelper/requirements.txt new file: pyhelper/tkhelper.py modified: pyproject.toml deleted: requirements.txt deleted: setup.py renamed: test_all.py -> tests/test_all.py
2 parents d96cbf3 + dd7e45f commit e7e405e

35 files changed

+1587
-1175
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ update.*
1919
cao.*
2020
test.*
2121
nul
22+
desktop.ini
23+
DEBUG
24+
feature

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎AUTHORS.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,31 @@
4646

4747
## 📎 About me:
4848

49-
| Property | Data |
50-
|-------------|--------------------------------------------|
51-
| **Name:** | nanocode38 |
52-
| **Age:** | 13 |
53-
| **Gender:** | ♂ |
54-
| **Email:** | [email protected] |
55-
| **Phone:** | +86 15867244980 (+86 18258770302) |
56-
| **WeChat:** | nanocode38 (Nickname: nanocode38) |
57-
| **QQ:** | 2602422835 |
58-
| **GitHub:** | [https://github.com/nanocode38](https://github.com/nanocode38)|
59-
| **Address:** | Ningbo, Zhejiang, China |
60-
| **Pet Phrase:** | 没有, 荣耀!, Glory!, 为了梅林的荣耀!, 我丢!, 卧艹! |
61-
| **Learned language:** | Chinese(perfection), Python(perfection), C++(proficiency), English(proficiency), JavaScript / TypeScript(grasp), C#(understand), PowerShell(understand), Bash(understand), HTML/CSS(understand)|
62-
| **Hobbies:** | Listening to English songs, Listening to absolute music, Reading science fiction, Learn all about the computer things, Coding, Play Basketball|
63-
| **Motto:** | <Too much !>|
64-
| **Favourit Color:** | deep purple(#9400D3), light orange(#FFA500), Klein Blue(#002FA7), black and light red(#000000 and #FF0000) |
65-
| **Favourit Number:**| 3, 33, 333, 3333, 50288, 333333, π(PI), i, φ(fai, golden ratio)|
66-
| **Favourit Plane Figure:** | ◣(right triangle) |
67-
| **Favourite Formula:**| $e^{i\pi} + 1 = 0$, $x = \frac{-b \pm \sqrt{b^2 - 4ac}}{2a}$|
68-
| **Profile:** | A lazy, science-fiction-loving junior saltwater programmer dreams of becoming a middle saltwater|
49+
| Property | Data |
50+
|-------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
51+
| **Name:** | nanocode38 |
52+
| **Age:** | 14 |
53+
| **Gender:** | ♂ |
54+
| **Email:** | [email protected] |
55+
| **Phone:** | +86 15867244980 (+86 18258770302) |
56+
| **WeChat:** | nanocode38 (Nickname: nanocode38) |
57+
| **QQ:** | 2602422835 |
58+
| **GitHub:** | [https://github.com/nanocode38](https://github.com/nanocode38) |
59+
| **Address:** | Ningbo, Zhejiang, China |
60+
| **Pet Phrase:** | 没有, 荣耀!, Glory!, 为了梅林的荣耀!, 我丢!, 卧艹! |
61+
| **Learned language:** | Chinese(perfection), Python(perfection), C++(proficiency), English(proficiency), JavaScript / TypeScript(grasp), C#(understand), PowerShell(understand), Bash(understand), HTML/CSS(understand) |
62+
| **Hobbies:** | Listening to English songs, Listening to absolute music, Reading science fiction, Learn all about the computer things, Coding, Play Basketball |
63+
| **Motto:** | <Too much !> |
64+
| **Favourit Color:** | deep purple(#9400D3), light orange(#FFA500), Klein Blue(#002FA7), black and light red(#000000 and #FF0000) |
65+
| **Favourit Number:**| 3, 33, 333, 3333, 50288, 333333, π(PI), i, φ(fai, golden ratio) |
66+
| **Favourit Plane Figure:** | ◣(right triangle) |
67+
| **Favourite Formula:**| $e^{i\pi} + 1 = 0$, $x = \frac{-b \pm \sqrt{b^2 - 4ac}}{2a}$ |
68+
| **Profile:** | A lazy, science-fiction-loving junior saltwater programmer dreams of becoming a middle saltwater |
6969

7070

7171
## 📫 How to Reach me:
7272
<p align="left">
73-
<a href="https://2602422835@qq.com" target="blank"><img align="center" src="https://raw.githubusercontent.com/nanocode38/nanocode38/master/assets/gmail.svg" alt="nanocode38" height="30" width="30" /></a>
73+
<a href="https://nanocode38@88.com" target="blank"><img align="center" src="https://raw.githubusercontent.com/nanocode38/nanocode38/master/assets/gmail.svg" alt="nanocode38" height="30" width="30" /></a>
7474

7575

7676

‎HISTORY.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,15 @@
7777
- Feat: pyhelper.mathhelper.INF
7878
- Feat: pyhelper.mathhelper.calculate_pi()
7979
- Feat: pyhelper.TKhelper.shake_window(), password_window(), setting_password_window(), center_window()
80+
81+
## <2025.7.10> Version 2.5.2
82+
- Update: Website
83+
84+
Ready to use Git Flow
85+
86+
## <2025.7.10> Version 2.6.0
87+
- Fix: sample(), shuffle() Do not include random parameters
88+
- Docs: Update E-mail
89+
- Docs: Convert document format to Google format
90+
- Fix: Cyclic introduction in pyhelper.gamehelpers.pghelper.widgets and pyhelper.gamehelpers.pghelper
91+
- Feat: pyhelper.tkhelper

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ so the whl package must be downloaded and installed manually
1111

1212
To log in first [GitHub](https://github.com/), the [Pyhelper official website](https://github.com/pyhelper.git), and then find a ` ` ` Releases ` ` ` column,
1313
Click on the distribution below.
14-
![img.png](img.png)
14+
![](assets/img.png)
1515

1616
Then under Assets, download pyhelper-2.1.0-py2.py3-none-any.whl. The name may vary from version to version, but it should end with.whl
1717

18-
![img_1.png](img_1.png)
18+
![](assets/img_1.png)
1919

2020
Once the download is complete, switch to the directory containing the whl file and run pip3 install [Whl file], replacing [Whl file] with the name of the whl file you downloaded
2121

‎Web/icon.ico‎

-138 KB
Binary file not shown.

‎Web/icon_small.ico‎

-8.79 KB
Binary file not shown.

‎Web/index.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>PyHelper: Python & Pygame Enhancement Toolkit</title>
7-
<link rel="icon" href="icon.ico" type="image/x-icon">
7+
<link rel="icon" href="../assets/LOGO.png" type="image/width-icon">
88
<link rel="stylesheet" href="styles.css">
99
</head>
1010
<body>
@@ -14,20 +14,20 @@
1414
<!-- Navbar with logo -->
1515
<div class="navbar">
1616
<div class="logo-container">
17-
<img src="icon_small.ico" class="navbar-logo"></img>
17+
<img src="../assets/LOGO.png" class="navbar-logo" width="80px" height="80px"></img>
1818

19-
<div class="logo-text">PyHelper</div>
19+
<div class="logo-prompt">&nbsp&nbsp&nbsp&nbspPyHelper</div>
2020
</div>
2121
<div class="nav-links">
2222
<a href="https://GitHub.com/nanocode38/pyhelper.git" class="nav-button">GitHub</a>
23-
<a href="https://github.com/nanocode38/pyhelper/releases/download/v2.5.2/pyhelper-2.5.2-py3-none-any.whl" class="nav-button">Download</a>
23+
<a href="https://github.com/nanocode38/pyhelper/releases/download/v2.6.0/pyhelper-2.6.0-py3-none-any.whl" class="nav-button">Download</a>
2424
</div>
2525
</div>
2626

2727
<!-- Main content -->
2828
<div class="content">
2929
<!-- Main logo -->
30-
<img src="icon.ico" class="navbar-logo"></img>
30+
<img src="../assets/LOGO.png" class="navbar-logo" width="300px"></img>
3131

3232
<h1>Welcome to PyHelper</h1>
3333
<h3>PyHelper is a powerful tool set for complementing Python and Pygame development. Enhance your coding experience with our utilities and helpers.</h3>
@@ -36,7 +36,7 @@ <h3>PyHelper is a powerful tool set for complementing Python and Pygame developm
3636
<a href="https://github.com/nanocode38/pyhelper.git" class="animated-button">
3737
<span class="button-icon">🌐</span> Link to GitHub
3838
</a>
39-
<a href="https://github.com/nanocode38/pyhelper/releases/download/v2.5.2/pyhelper-2.5.2-py3-none-any.whl" class="animated-button download-btn">
39+
<a href="https://github.com/nanocode38/pyhelper/releases/download/v2.6.0/pyhelper-2.6.0-py3-none-any.whl" class="animated-button download-btn">
4040
<span class="button-icon">⬇️</span> Download Now
4141
</a>
4242
</div>
@@ -57,19 +57,19 @@ <h2>Why Choose PyHelper?</h2>
5757
<div class="feature-card">
5858
<div class="feature-icon">⚡</div>
5959
<h3 class="feature-title">Optimized Performance</h3>
60-
<p class="feature-text">Accelerate your Pygame projects with our high-performance utilities.</p>
60+
<p class="feature-prompt">Accelerate your Pygame projects with our high-performance utilities.</p>
6161
</div>
6262

6363
<div class="feature-card">
6464
<div class="feature-icon">🛠️</div>
6565
<h3 class="feature-title">Developer Tools</h3>
66-
<p class="feature-text">Essential tools for debugging and optimizing your Python code.</p>
66+
<p class="feature-prompt">Essential tools for debugging and optimizing your Python code.</p>
6767
</div>
6868

6969
<div class="feature-card">
7070
<div class="feature-icon">🧩</div>
7171
<h3 class="feature-title">Easy Integration</h3>
72-
<p class="feature-text">Seamlessly integrates with your existing Python and Pygame projects.</p>
72+
<p class="feature-prompt">Seamlessly integrates with your existing Python and Pygame projects.</p>
7373
</div>
7474
</div>
7575
</div>

‎Web/styles.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ body {
6262
display: flex;
6363
align-items: center;
6464
animation: fadeIn 0.8s ease-out;
65+
font-size: 30px;
6566
}
6667

6768
.nav-logo {

‎assets/LOGO.png‎

157 KB
Loading

0 commit comments

Comments
 (0)