Commit Graph

3187 Commits

Author SHA1 Message Date
Hind-M 607c39035c
Correctly rename test to be run (#3545)
* Correctly rename test to be run

* Fix test

* Skip oci test

* Real fix hopefully

* Skip test on windows

* Adjust comment
2024-10-21 09:18:57 +02:00
Julien Jerphanion 0ad7255b24
maint: Unpin libcurl<8.10 (#3548)
To see if 8.10.1 solved the problem.

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-10-17 17:00:11 +02:00
Julien Jerphanion 7ae780c6ed
dev: Remove the use of Taskfile (#3544)
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-10-17 13:55:22 +02:00
Hind-M 3d71f57517
Create empty base prefix with `env update` (#3519) 2024-10-16 10:53:51 +02:00
Julien Jerphanion c329ca0401
fix: Use POSIX-compliant scripts (#3522)
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-10-15 18:30:46 +02:00
Julien Jerphanion 764f85f881
maint: Clarify `env` subcommand documentation in help menu (cont'd) (#3539)
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-10-15 18:30:24 +02:00
NewUserHa 9eb24012fc
fix: Handle space in `mamba` and `micromamba` executable absolute paths (#3525) 2024-10-15 18:06:57 +02:00
Julien Jerphanion 5e30f9f777
maint: Clarify `env` subcommand documentation in help menu (#3502)
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Hind-M <70631848+Hind-M@users.noreply.github.com>
2024-10-15 17:07:20 +02:00
Julien Jerphanion 91a2a2b868
fix: Adapt `test_env_update_pypi_with_conda_forge` (#3537)
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-10-15 17:06:07 +02:00
Hind-M 215e5e522a
Add recommendation if error with root prefix (#3513)
Add recommendation if error
2024-10-07 19:43:03 +02:00
Julien Jerphanion c4068d3117
fix: Ignore inline comment in environment specification (#3512)
Fix https://github.com/mamba-org/mamba/issues/3509

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-10-07 19:18:31 +02:00
mleistner-bgr 1e8694e1fc
Replace `[System.IO.Path]::GetFileNameWithoutExtension` with `-replace` (#3510) 2024-10-07 18:25:02 +02:00
Johan Mabille 553eace9d7
Replaced rstrip reimplementation with call to remove_suffix (#3508) 2024-10-04 16:46:37 +02:00
Hind-M 80c8b184d0
Fix warnings and co (#3507) 2024-10-04 14:41:50 +02:00
Johan Mabille 675c6de0e6
Upgraded CI to micromamba 2.0.2 (#3497)
* Upgraded CI to micromamba 2.0.2

* Investigate CI setup

* touch my.bat
2024-10-04 08:54:44 +02:00
Johan Mabille 31b23473e0 release libmamba 2.0.2, libmambapy 2.0.2, micromamba 2.0.2 2024-10-02 18:03:58 +02:00
Julien Jerphanion b7367417f7
fix: Handle `MatchSpec` with brackets when parsing environments' history (#3490)
* fix: Adapt `parse_comment_line` to handle more `MatchSpec`

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* test: Add non-regression python test

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* test: Add non-regression C++ test

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Apply review comments

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

Co-authored-by: Johan Mabille <johan.mabille@gmail.com>

* test: Skip test on Windows

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

---------

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Johan Mabille <johan.mabille@gmail.com>
2024-10-02 17:21:57 +02:00
Johan Mabille d162759107
Win activate (#3489)
* Fixed activation scripts for cmd.exe

* Fixed get_PATH on Windows

* linter
2024-10-02 15:06:53 +02:00
Hind-M 45c437a3c8
Fix `channel` and `base_url` in `list` cmd (#3488)
* Fix channel and base_url in list cmd

* Add func

* Fix oci tests
2024-10-02 14:01:07 +02:00
Johan Mabille 0b97555fbc
Rollback to micromamba 1.5.10 in CI (#3491) 2024-10-02 12:51:06 +02:00
Johan Mabille 9fc7b99ea3 release libmamba 2.0.1, libmambapy 2.0.1, micromamba 2.0.1 2024-09-30 22:05:50 +02:00
Johan Mabille f8bfd115df
Fixed channel output in umamba list (#3486)
Fixed channel output in umamba list
2024-09-30 21:49:44 +02:00
Johan Mabille b23a07956a
--full-name option for list (#3485)
Added --full-name option to the list command
2024-09-30 19:28:04 +02:00
Julien Jerphanion 0b824fe252
fix: Support for PEP 440 "Compatible Releases" (operator `~=` for `MatchSpec`) (#3483)
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Johan Mabille <johan.mabille@gmail.com>
2024-09-30 16:41:49 +02:00
Johan Mabille 2e8b3ee7bc
Fix micromamba activate on Windows (#3484)
Fixed mamba_hook.bat
2024-09-30 16:06:13 +02:00
Johan Mabille 79034ebff1
Added --copy flag to create and install commands (#3474)
Co-authored-by: Sylvain Corlay <sylvain.corlay@gmail.com>
2024-09-28 07:07:11 +02:00
Tim Hoffmann db5f6de8f2
doc: add github links to documentation (#3471)
I've tried to find the github repository from the documentation, but it seems that it's not linked.

This PR adds links

- as a button in the theme
- at the top of https://mamba.readthedocs.io/en/latest/developer_zone/contributing.html

Co-authored-by: Sylvain Corlay <sylvain.corlay@gmail.com>
2024-09-28 04:54:50 +02:00
Johan Mabille df9a2dcc77
GHA issue workaround (#3476)
Back to micromamba 1.5.10 on Windows
2024-09-27 21:35:20 +02:00
Johan Mabille a656fe9524 release libmamba 2.0.0, libmambapy 2.0.0, micromamba 2.0.0 2024-09-25 11:31:42 +02:00
Hind Montassif d3cb2f8a0c release libmamba 2.0.0rc6, libmambapy 2.0.0rc6, micromamba 2.0.0rc6 2024-09-20 15:58:06 +02:00
Julien Jerphanion 860ae0ea04
test: `MatchSpec` edges cases (#3458)
Add edge case test

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-09-20 14:49:54 +02:00
Hind-M ad8ca3cf02
Compute `root prefix` as mamba install path (#3447)
* Compute root prefix as mamba install path

* Run test only on linux

* Test conflict between conda and mamba with same base env in CI

* Change strategy

* Use target_compile_definitions instead of add_definitions

* Add test logs

* Add ENABLE_MAMBA_ROOT_PREFIX_FALLBACK OPTION
2024-09-20 14:36:17 +02:00
Julien Jerphanion 1c755675bf
fix: Handle extra white-space in `MatchSpec` (#3456)
* test: Add non-regression test for #3453

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Minimal suboptimal fix

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Add edge cases to the env specification

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* test: Add `MatchSpec` parsing subcases

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* test: Complete `test_env_create_whitespace`

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Add kytea test case

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Merge replacement of binary operators

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Lint with pre-commit

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Adapt MatchSpec

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

Co-authored-by: Hind Montassif <hind.montassif@gmail.com>

* Remove redundant test

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

Co-authored-by: Hind Montassif <hind.montassif@gmail.com>

* Rename subcase

Co-authored-by: Hind-M <70631848+Hind-M@users.noreply.github.com>

* Adapt comparison on versions

Co-authored-by: Hind-M <70631848+Hind-M@users.noreply.github.com>

* Adapt test case

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Remove pytorch-cpu as it is not available on windows

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

---------

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Hind Montassif <hind.montassif@gmail.com>
Co-authored-by: Hind-M <70631848+Hind-M@users.noreply.github.com>
2024-09-19 16:54:58 +02:00
Sylvain Corlay 6db44c8a64
Support CONDA_DEFAULT_ENV (#3445)
* Support CONDA_DEFAULT_ENV

* Fix test
2024-09-19 16:40:00 +02:00
Hind-M fc06ae8bbc
Fix `test_env_update_pypi_with_conda_forge` (#3459)
Fix test
2024-09-19 11:43:05 +02:00
Hind-M a9d8ea58ff
Fix wrong version of miniforge in doc (#3462) 2024-09-19 11:27:10 +02:00
Julien Jerphanion 81c099c3a1
fix: Environment removal confirmation (#3450)
* fix: Environment removal confirmation

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Handle empty environment deletion

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Handle 'n'

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Reoder logic

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Use enum class for `RemoveResult`

Co-authored-by: Hind-M <70631848+Hind-M@users.noreply.github.com>

---------

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Hind-M <70631848+Hind-M@users.noreply.github.com>
2024-09-17 17:38:06 +02:00
Hind-M af81975dbc
Remove cctools patch removal in CI (#3451) 2024-09-17 15:08:00 +02:00
Hind-M b08d40d4d7
Fix test in osx (#3448)
Use PRE_COMMIT_USE_MAMBA instead of PRE_COMMIT_USE_MICROMAMBA
2024-09-17 13:40:38 +02:00
Hind Montassif f1f0827e08 release libmamba 2.0.0rc5, libmambapy 2.0.0rc5, micromamba 2.0.0rc5 2024-09-13 10:55:58 +02:00
Johan Mabille 5810eb8c0b
Remove cctools patch from feedstock in CI (#3442) 2024-09-12 21:26:43 +02:00
Wolf Vollprecht a261cd461d
fix: add warning when using defaults (#3434)
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Hind Montassif <hind.montassif@gmail.com>
Co-authored-by: Johan Mabille <johan.mabille@gmail.com>
Co-authored-by: Sylvain Corlay <sylvain.corlay@gmail.com>
2024-09-12 19:28:40 +02:00
Hind-M 12fef58c37
Add fallback to root prefix (#3435)
* Add fallback to root prefix

* Fix test_not_env

* Fix tests

* Add tests with no env var
2024-09-10 15:10:21 +02:00
Julien Jerphanion 71f0ed38fb
docs: Specify `CMAKE_INSTALL_PREFIX` (#3438)
docs: Specify CMAKE_INSTALL_PREFIX

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
2024-09-10 13:51:42 +02:00
Silvio Traversaro 841b272cef
Fix x86_64 to use underscore instead of dash (#3433)
See https://github.com/mamba-org/mamba/issues/3222#issuecomment-2284324975 .

Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
2024-09-10 10:39:25 +02:00
Johan Mabille f8bb11c853
Fixed micromamba static build after cctools and ld64 upgrade on conda… (#3436)
Fixed micromamba static build after cctools and ld64 upgrade on conda-forge
2024-09-09 16:53:28 +02:00
Julien Jerphanion c4a6e78a78
fix: PyPI support for `env update` (#3419)
* Simple fix

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Factor elements in `pip_utils.{hpp,cpp}`

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* docs: Add TODO

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* test: Creation and update of env with pip sections

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Use quiet mode for pip

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Address review comments

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

Co-authored-by: Johan Mabille <johan.mabille@gmail.com>

* Invert headers' inclusion

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* Address review comments

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

Co-authored-by: Hind Montassif <hind.montassif@gmail.com>

* Add more tests

* Use enum instead of bool

* Adapt tests

* Add warning

* Clean up

---------

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
Co-authored-by: Johan Mabille <johan.mabille@gmail.com>
Co-authored-by: Hind Montassif <hind.montassif@gmail.com>
2024-09-05 15:41:39 +02:00
Hind-M 1bdf6f1748
Fix output (#3428)
Only print activation message when target prefix is not active
2024-09-02 14:25:20 +02:00
Sylvain Corlay 4f73c92713
Update mamba.sh.in script (#3422)
* Update mamba.sh.in script

* Set root prefix

* Update mamba_package/etc/profile.d/mamba.sh.in

Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>

---------

Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
2024-08-31 00:31:20 +02:00
Sylvain Corlay d51cd0e451
Execute remove action before install actions (#3424) 2024-08-31 00:30:24 +02:00