Skip to content

Commit 40edded

Browse files
stonebigstonebig
authored
Merge pull request #1654 from stonebig/master
make pseudo-wheel part of winpython a true wheel 'wppm'
2 parents 6e42fab + 9f94cda commit 40edded

15 files changed

+1066
-1066
lines changed

‎make.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import subprocess
1313
import sys
1414
from pathlib import Path
15-
from winpython import wppm, utils, diff
15+
from wppm import wppm, utils, diff
1616

1717
# Define constant paths for clarity
1818
CHANGELOGS_DIRECTORY = Path(__file__).parent / "changelogs"
@@ -222,7 +222,7 @@ def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirnam
222222
utils.python_execmodule("ensurepip", self.distribution.target)
223223
self.distribution.patch_standard_packages("pip")
224224

225-
essential_packages = ["pip", "setuptools", "wheel", "winpython"]
225+
essential_packages = ["pip", "setuptools", "wheel", "wppm"]
226226
for package_name in essential_packages:
227227
actions = ["install", "--upgrade", "--pre", package_name] + self.install_options
228228
self._print_action(f"Piping: {' '.join(actions)}")
@@ -247,8 +247,8 @@ def build(self, rebuild: bool = True, requirements_files_list=None, winpy_dirnam
247247
diff.write_changelog(self.winpyver2, None, CHANGELOGS_DIRECTORY, self.flavor, self.distribution.architecture, basedir=self.winpython_directory.parent)
248248

249249
def rebuild_winpython_package(source_directory: Path, target_directory: Path, architecture: int = 64, verbose: bool = False):
250-
"""Rebuilds the winpython package from source using flit."""
251-
for file in target_directory.glob("winpython-*"):
250+
"""Rebuilds the winpython or wppm package from source using flit."""
251+
for file in target_directory.glob("w*p*-*.*"):
252252
if file.suffix in (".exe", ".whl", ".gz"):
253253
file.unlink()
254254
utils.buildflit_wininst(source_directory, copy_to=target_directory, verbose=True)
@@ -295,7 +295,7 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in
295295
os.makedirs(build_directory, exist_ok=True)
296296
# use source_dirs as the directory to re-build Winpython wheel
297297
winpython_source_dir = Path(__file__).resolve().parent
298-
rebuild_winpython_package(winpython_source_dir, Path(source_dirs), architecture, verbose)
298+
# 2025-06-28 no more: rebuild_winpython_package(winpython_source_dir, Path(source_dirs), architecture, verbose)
299299

300300
builder = WinPythonDistributionBuilder(
301301
build_number, release_level, build_directory, wheels_directory=source_dirs,

‎portable/scripts/make_working_directory_and_userprofile_be_winpython.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
call "%~dp0env_for_icons.bat"
2-
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"
3-
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[inactive_environment_common]', '[active_environment_common]' )"
2+
"%PYTHON%" -c "from wppm.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"
3+
"%PYTHON%" -c "from wppm.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[inactive_environment_common]', '[active_environment_common]' )"

‎portable/scripts/make_working_directory_be_not_winpython.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
call "%~dp0env_for_icons.bat"
2-
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"
3-
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[inactive_environment_per_user]', '[active_environment_per_user]' )"
2+
"%PYTHON%" -c "from wppm.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"
3+
"%PYTHON%" -c "from wppm.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[inactive_environment_per_user]', '[active_environment_per_user]' )"

‎portable/scripts/make_working_directory_be_winpython.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
call "%~dp0env_for_icons.bat"
2-
"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"
2+
"%PYTHON%" -c "from wppm.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"

‎portable/scripts/upgrade_pip.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ call "%~dp0env.bat"
33
echo this will upgrade pip with latest version, then patch it for WinPython portability ok ?
44
pause
55
"%WINPYDIR%\python.exe" -m pip install --upgrade pip
6-
"%WINPYDIR%\python.exe" -c "from winpython import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=True)
6+
"%WINPYDIR%\python.exe" -c "from wppm import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=True)
77
pause

‎pyproject.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ requires = ["flit_core"]
33
build-backend = "flit_core.buildapi"
44

55
[project]
6-
name = "winpython"
6+
name = "wppm"
77
authors = [
88
{name = "Pierre Raybaut"},
99
{name = "stonebig"},
1010
]
1111
dependencies = []
12-
requires-python = ">=3.8"
12+
requires-python = ">=3.10"
1313
readme = "README.rst"
1414
license = {file = "LICENSE"}
1515
classifiers=[
@@ -25,12 +25,12 @@ classifiers=[
2525
'Topic :: Software Development :: Widget Sets',
2626
]
2727
dynamic = ["version",]
28-
description="WinPython distribution tools, including WPPM"
28+
description="WinPython Package Management"
2929
keywords = ["Portable","Windows"]
3030

3131
[project.urls]
3232
Documentation = "https://winpython.github.io/"
3333
Source = "https://github.com/winpython/winpython"
3434

3535
[project.scripts]
36-
wppm = "winpython.wppm:main"
36+
wppm = "wppm.wppm:main"

winpython/__init__.py renamed to wppm/__init__.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
# -*- coding: utf-8 -*-
2-
"""
3-
WinPython License Agreement (MIT License)
4-
-----------------------------------------
5-
6-
Copyright (c) 2012-2013 Pierre Raybaut
7-
Copyright (c) 2014-2025+ The Winpython development team https://github.com/winpython/
8-
9-
Permission is hereby granted, free of charge, to any person
10-
obtaining a copy of this software and associated documentation
11-
files (the "Software"), to deal in the Software without
12-
restriction, including without limitation the rights to use,
13-
copy, modify, merge, publish, distribute, sublicense, and/or sell
14-
copies of the Software, and to permit persons to whom the
15-
Software is furnished to do so, subject to the following
16-
conditions:
17-
18-
The above copyright notice and this permission notice shall be
19-
included in all copies or substantial portions of the Software.
20-
21-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
22-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
23-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
24-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
25-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
26-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
27-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
28-
OTHER DEALINGS IN THE SOFTWARE.
29-
"""
30-
31-
__version__ = '16.6.20250620'
32-
__license__ = __doc__
33-
__project_url__ = 'http://winpython.github.io/'
1+
# -*- coding: utf-8 -*-
2+
"""
3+
WinPython License Agreement (MIT License)
4+
-----------------------------------------
5+
6+
Copyright (c) 2012-2013 Pierre Raybaut
7+
Copyright (c) 2014-2025+ The Winpython development team https://github.com/winpython/
8+
9+
Permission is hereby granted, free of charge, to any person
10+
obtaining a copy of this software and associated documentation
11+
files (the "Software"), to deal in the Software without
12+
restriction, including without limitation the rights to use,
13+
copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
copies of the Software, and to permit persons to whom the
15+
Software is furnished to do so, subject to the following
16+
conditions:
17+
18+
The above copyright notice and this permission notice shall be
19+
included in all copies or substantial portions of the Software.
20+
21+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
22+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
23+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
24+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
25+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
26+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
27+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
28+
OTHER DEALINGS IN THE SOFTWARE.
29+
"""
30+
31+
__version__ = '17.0.20250628'
32+
__license__ = __doc__
33+
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)