Skip to content

make wppm -r .! work better, and declare Packaging dependancy #1681

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 1 commit into from
Jul 13, 2025
Merged

make wppm -r .! work better, and declare Packaging dependancy #1681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ def _create_env_config(self):
}
env_path = self.winpython_directory / "scripts" / "env.ini"
env_path.parent.mkdir(parents=True, exist_ok=True)
print("zzz env_path", env_path)
self._print_action(f"Creating env.ini environment {env_path}")
env_path.write_text("\n".join(f"{k}={v}" for k, v in config.items()))

Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ authors = [
{name = "Pierre Raybaut"},
{name = "stonebig"},
]
dependencies = []
dependencies = [
"packaging",
]
requires-python = ">=3.10"
readme = "README.rst"
license = {file = "LICENSE"}
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.20250712b1'
__version__ = '17.1.20250714b1'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'
4 changes: 2 additions & 2 deletions 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] in("<", "~") or dependency["req_version"].startswith("==") 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 Expand Up @@ -249,7 +249,7 @@ def up(self, ppw: str, extra: str = "", depth: int = 20, indent: int = 5, versio
pp = ppw[:-1] if ppw.endswith('!') else ppw
ppend = "!" if ppw.endswith('!') else "" #show only downward limiting dependancies
if pp == ".":
results = [aa:=self.up(p + ppend, extra, depth, indent, version_req, verbose) if '[requires :' in aa else None for p in sorted(self.distro)]
results = [aa for p in sorted(self.distro) if '[requires' in (aa:=self.up(p + ppend, extra, depth, indent, version_req, verbose))]
return '\n'.join(filter(None, results))

if extra == ".":
Expand Down