folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try fixing missing subdirs on mamba.py (#2632) 

* Use install repo from libmamba in mamba.py

* Regenerate stubgens
This commit is contained in:
Antoine Prouvost 2023-06-29 10:54:54 +02:00 committed by GitHub
parent 50a627e002
commit 168e55e245
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmambapy/libmambapy/__init__.pyi
View File

@ -1077,6 +1077,14 @@ class PackageInfo:
def name(self, arg0: str) -> None: def name(self, arg0: str) -> None:
pass pass
@property @property
def noarch(self) -> str:
"""
:type: str
"""
@noarch.setter
def noarch(self, arg0: str) -> None:
pass
@property
def sha256(self) -> str: def sha256(self) -> str:
""" """
:type: str :type: str

1
libmambapy/src/main.cpp
View File

@ -807,6 +807,7 @@ PYBIND11_MODULE(bindings, m)
.def_readwrite("version", &PackageInfo::version) .def_readwrite("version", &PackageInfo::version)
.def_readwrite("build_string", &PackageInfo::build_string) .def_readwrite("build_string", &PackageInfo::build_string)
.def_readwrite("build_number", &PackageInfo::build_number) .def_readwrite("build_number", &PackageInfo::build_number)
.def_readwrite("noarch", &PackageInfo::noarch)
.def_readwrite("channel", &PackageInfo::channel) .def_readwrite("channel", &PackageInfo::channel)
.def_readwrite("url", &PackageInfo::url) .def_readwrite("url", &PackageInfo::url)
.def_readwrite("subdir", &PackageInfo::subdir) .def_readwrite("subdir", &PackageInfo::subdir)

23
mamba/mamba/mamba.py
View File

@ -55,7 +55,6 @@ from mamba.utils import (
get_installed_jsonfile, get_installed_jsonfile,
init_api_context, init_api_context,
load_channels, load_channels,
load_conda_installed,
print_activate, print_activate,
to_txn, to_txn,
) )
@ -175,13 +174,9 @@ def remove(args, parser):
repos = [] repos = []
# add installed # add installed
if use_mamba_experimental: prefix_data = api.PrefixData(context.target_prefix)
prefix_data = api.PrefixData(context.target_prefix) repo = api.Repo(pool, prefix_data)
repo = api.Repo(pool, prefix_data) repos.append(repo)
repos.append(repo)
else:
repo = load_conda_installed(pool, installed_json_f, installed_pkg_recs)
repos.append(repo)
solver = api.Solver(pool, solver_options) solver = api.Solver(pool, solver_options)
@ -451,15 +446,11 @@ def install(args, parser, command="install"):
repos = [] repos = []
prefix_data = api.PrefixData(context.target_prefix)
# add installed # add installed
if use_mamba_experimental: prefix_data = api.PrefixData(context.target_prefix)
repo = api.Repo(pool, prefix_data) prefix_data.add_packages(api.get_virtual_packages())
repos.append(repo) repo = api.Repo(pool, prefix_data)
else: repos.append(repo)
repo = load_conda_installed(pool, installed_json_f, installed_pkg_recs)
repos.append(repo)
if newenv and not specs: if newenv and not specs:
# creating an empty environment with e.g. "mamba create -n my_env" # creating an empty environment with e.g. "mamba create -n my_env"