Skip to content
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.

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

Add cross-platform support for the new menuinst #474

Merged
merged 118 commits into from
Jan 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
aee42a4
support alphas and other non-int minor versions
jaimergp Nov 20, 2021
45648b9
act on .version
jaimergp Nov 20, 2021
1539d90
fix conda version handling again
jaimergp Nov 20, 2021
4cbe932
add shortcuts handling on linux / macos
jaimergp Nov 21, 2021
006c584
change how --shortcuts-only is set
jaimergp Nov 22, 2021
f882d79
handle shortcus with --shortcuts-only now
jaimergp Nov 25, 2021
9fc8f95
simplify shortcut flags generation
jaimergp Mar 25, 2022
6d94530
conda-standalone always available as $PREFIX/_conda.exe
jaimergp Mar 25, 2022
0f86922
revert accidental error on rebase
jaimergp Mar 25, 2022
a8bd12c
make shortcuts optional on windows again
jaimergp Mar 25, 2022
76c826b
Merge remote-tracking branch 'upstream/main' into menuinst-cep
jaimergp Sep 15, 2022
710a658
rework some options
jaimergp Sep 15, 2022
34019a5
fix macro conditional
jaimergp Sep 16, 2022
46d814e
ensure conda is in base env for extra_envs so we can remove the has_c…
jaimergp Sep 16, 2022
d6e5b98
update script path
jaimergp Sep 16, 2022
4a1fe01
escape curly braces
jaimergp Sep 16, 2022
5332f83
render docs
jaimergp Sep 16, 2022
b270777
fix quotes
jaimergp Sep 16, 2022
9703908
adjust cli syntax
jaimergp Sep 19, 2022
06cfade
Merge branch 'main' into menuinst-cep
jaimergp Nov 3, 2022
f501c97
define CONDA_ROOT_PREFIX so conda-standalone doesn't incorrectly use …
jaimergp Nov 23, 2022
0026dd6
Merge branch 'main' into menuinst-cep
jaimergp Nov 23, 2022
33fad98
set CONDA_ROOT_PREFIX on uninstaller too
jaimergp Dec 8, 2022
b5bf02b
add env shortcuts.txt to shar
jaimergp Dec 20, 2022
5febc0a
remove unused import
jaimergp Dec 20, 2022
f8449ed
Merge remote-tracking branch 'upstream/main' into menuinst-cep
jaimergp Jan 9, 2023
908c317
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Jan 10, 2023
a9987b2
ppd templating doesn't support nested ifs
jaimergp Jan 10, 2023
d767967
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Jan 17, 2023
f248db6
add 'enable_shortcuts' to shellcheck
jaimergp Jan 17, 2023
1272033
pre-commit
jaimergp Jan 17, 2023
d1b28e0
sync docs
jaimergp Jan 17, 2023
86508f6
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Jan 19, 2023
01d768a
fix shellcheck
jaimergp Jan 19, 2023
cbc8fb3
relax test
jaimergp Jan 19, 2023
e266c5c
only sh
jaimergp Jan 19, 2023
f76a60c
Merge remote-tracking branch 'upstream/main' into menuinst-cep
dbast Jan 26, 2023
1e23a0e
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Feb 8, 2023
dcfe76a
revert to 'all'
jaimergp Feb 10, 2023
3ab19c5
Merge branch 'main' into menuinst-cep
jaimergp Feb 15, 2023
1913d14
Merge branch 'main' into menuinst-cep
jaimergp Jun 19, 2023
d77d4a5
Merge branch 'main' into menuinst-cep
jaimergp Jun 22, 2023
3f0b97b
create .nonadmin if not run as sudo
jaimergp Jun 29, 2023
82a8143
add menuinst v2 tests
jaimergp Jul 6, 2023
2063525
Try with bundle_tools_2 and let's see what happens!
jaimergp Jul 7, 2023
5c62287
missing .exists()
jaimergp Jul 10, 2023
e95a193
fix expected paths
jaimergp Jul 10, 2023
a3ab442
print windows install logs to stderr
jaimergp Jul 10, 2023
5729bd3
move back to napari/label/bundle_tools_3
jaimergp Jul 10, 2023
5cec5c7
darwin in lowercase
jaimergp Jul 10, 2023
72baca8
debug windows ci
jaimergp Jul 10, 2023
5974931
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Jul 10, 2023
eeb8d09
try using cmd on windows?
jaimergp Jul 10, 2023
2997281
move tmate
jaimergp Jul 10, 2023
e834b96
assert before uninstalling
jaimergp Jul 10, 2023
61f2569
restore workflow
jaimergp Jul 10, 2023
3e5233c
force activate constructor-dev
jaimergp Jul 11, 2023
b16bb9e
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Jul 11, 2023
f4dee8a
do not initialize conda by default
jaimergp Jul 11, 2023
86dbb9d
restore main.yml
jaimergp Jul 11, 2023
4250889
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Jul 13, 2023
b0b2388
guard against undefined env vars
jaimergp Jul 13, 2023
6e054d9
Merge branch 'main' into menuinst-cep
jaimergp Aug 16, 2023
fa6c7f8
remove dup key
jaimergp Aug 21, 2023
09d3964
deprecate menuinst wrappers
jaimergp Aug 22, 2023
e57fe08
Merge branch 'main' into menuinst-cep
jaimergp Sep 7, 2023
2aa2458
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Dec 12, 2023
9f02022
Merge branch 'menuinst-cep' of github.com:jaimergp/constructor into m…
jaimergp Dec 12, 2023
8459f76
revert bad merge
jaimergp Dec 12, 2023
df8f97c
allow micromamba in some cases
jaimergp Dec 18, 2023
a58e839
better place for guards
jaimergp Dec 18, 2023
6260793
add docs
jaimergp Dec 18, 2023
5664a06
pre-commit
jaimergp Dec 18, 2023
30dca7c
rerender docs
jaimergp Dec 18, 2023
d43ec53
process all envs under $INSTDIR
jaimergp Dec 18, 2023
1ed708d
extend not append
jaimergp Dec 18, 2023
9daa6c7
this is already a list
jaimergp Dec 18, 2023
73671ae
enable micromamba tests on Windows
jaimergp Dec 18, 2023
eb2de34
do not skip here either
jaimergp Dec 18, 2023
6cede2b
do not test micromamba x windows yet
jaimergp Dec 18, 2023
b51d2e6
use regular conda-standalone nightly
jaimergp Dec 19, 2023
2dd8068
test miniforge shortcuts too
jaimergp Dec 19, 2023
9bae24a
pre-commit
jaimergp Dec 19, 2023
09e6b0d
debug
jaimergp Dec 19, 2023
ea8d0a3
retrigger
jaimergp Dec 19, 2023
5957eb3
revert
jaimergp Dec 19, 2023
ae80615
fix expected path
jaimergp Dec 19, 2023
3f6a4dd
debug conda-standalone 23.10
jaimergp Dec 19, 2023
9feb8c5
debug uninstall logs too
jaimergp Dec 19, 2023
48a1576
try more verbosity
jaimergp Dec 19, 2023
7c62ef6
fix SetDetailsPrint
jaimergp Dec 19, 2023
762a93c
logset on in uninstall
jaimergp Dec 19, 2023
d54149d
pass name
jaimergp Dec 19, 2023
06c53f6
tmate again
jaimergp Dec 20, 2023
56d9d73
revert debugging and require conda-standalone 23.11
jaimergp Dec 20, 2023
dd1321d
Merge branch 'main' of github.com:conda/constructor into menuinst-cep
jaimergp Dec 20, 2023
6aa66b7
comment version out for now
jaimergp Dec 20, 2023
f4bb479
remove libmamba specific test
jaimergp Dec 20, 2023
0af4bb4
add news
jaimergp Dec 20, 2023
a73a27a
skip / xfail as needed
jaimergp Dec 20, 2023
137b5e6
warn early about incompatible conda-exes
jaimergp Dec 20, 2023
93d43dc
test menu_packages from extra_envs
jaimergp Dec 20, 2023
54af393
debug
jaimergp Dec 20, 2023
ceadb38
fix directory
jaimergp Dec 20, 2023
5657c99
revert debugging
jaimergp Dec 20, 2023
ae51ac0
allow None
jaimergp Dec 20, 2023
af74ec4
pre-commit
jaimergp Dec 20, 2023
7cd489b
win-select menu_packages too
jaimergp Dec 20, 2023
6ea01e1
revert -k selector
jaimergp Dec 20, 2023
858371a
mark as incompatible, not disabled
jaimergp Dec 20, 2023
e585dea
fix shellcheck tests
jaimergp Dec 20, 2023
d2a1dc6
fix conda_exe param
jaimergp Dec 20, 2023
ce635fa
fix $env_shortcuts
jaimergp Dec 20, 2023
3627370
rename conda.exe to _conda on Unix
jaimergp Jan 4, 2024
16ee77a
pre-commit
jaimergp Jan 4, 2024
69cddad
pre-commit
jaimergp Jan 4, 2024
03cd520
compare enable_shortcuts to strings
jaimergp Jan 5, 2024
c5ee5f1
return early
jaimergp Jan 5, 2024
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
Prev Previous commit
Next Next commit
fix conda version handling again
jaimergp committed Mar 25, 2022
commit 1539d90d53b66c22368caf971c1073ba401f6991
4 changes: 1 addition & 3 deletions constructor/conda_interface.py
Original file line number Diff line number Diff line change
@@ -24,9 +24,7 @@
from conda.models.version import VersionOrder

_conda_version = VersionOrder(CONDA_INTERFACE_VERSION).version
_conda_major = _conda_version[1]
_conda_minor = _conda_version[2][0] if isinstance(_conda_version[2], list) else _conda_version[2]
CONDA_MAJOR_MINOR = _conda_major, _conda_minor
CONDA_MAJOR_MINOR = _conda_version[1][0], _conda_version[2][0]

from conda._vendor.toolz.itertoolz import (
concatv as _concatv, get as _get, groupby as _groupby,