Skip to content

two small bugfix for b1 #1682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 14, 2025
Merged

two small bugfix for b1 #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6341a98
fixing the smallest bug requires to republish in the new workflow
stonebig Jul 13, 2025
9d87ece
fix naming of the compressed WinPython
stonebig Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions generate_a_winpython_distro.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
rem generate_a_winpython_distro.bat: to be launched from a winpython directory, where 'make.py' is
@echo on

REM Initialize variables
if "%my_release_level%"=="" set my_release_level=
REM Initialize variables -!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!-!
if "%my_release_level%"=="" set my_release_level=b1
if "%my_create_installer%"=="" set my_create_installer=True

rem Set archive directory and log file
Expand Down Expand Up @@ -221,7 +221,7 @@ set out=WinPython%my_flavor%-%my_arch%bit-%WINPYVER2%_History.md
copy/y %my_basedir%\bu%my_flavor%\%out% %~dp0changelogs\%out%

rem compress
set stem=WinPython%my_arch%-%WINPYVER2%%my_flavor%
set stem=WinPython%my_arch%-%WINPYVER2%%my_flavor%%my_release_level
%target_python_exe% -c "from wppm import utils;utils.command_installer_7zip(r'%my_WINPYDIRBASE%', r'%my_WINPYDIRBASE%\..',r'%stem%', r'%my_create_installer%')"

echo -------------------------------------- >>%my_archive_log%
Expand Down
2 changes: 1 addition & 1 deletion wppm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"""

__version__ = '17.1.20250714b1'
__version__ = '17.1.20250715b1'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'
2 changes: 1 addition & 1 deletion wppm/piptree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def _get_dependency_tree(self, package_name: str, extra: str = "", version_req:
Marker(dependency["req_marker"]).evaluate(environment=environment | {"extra": up_req})):
# IA risk error: # dask[array] go upwards as dask[dataframe], so {"extra": up_req} , not {"extra": extra}
#tag downward limiting dependancies
wall = " " if dependency["req_version"][:1] = "~" or dependency["req_version"].startswith("==") or "<" in dependency["req_version"] else ""
wall = " " if dependency["req_version"][:1] == "~" or dependency["req_version"].startswith("==") or "<" in dependency["req_version"] else ""
ret += self._get_dependency_tree(
dependency["req_key"],
up_req,
Expand Down