diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e08bc48d7..2f18fe958e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +2022.11.25 +========== + +Releases: libmamba 1.1.0, libmambapy 1.1.0, mamba 1.1.0, micromamba 1.1.0 + +Some bugfixes for 1.0 and experimental release of the new solver messages + +Bug fixes + +- [micromamba] Fix fish scripts (thanks @JafarAbdi, @raj-magesh, @jonashaag) #2101 +- [mamba] Fix activate/deactivate in fish shell (thanks @psobolewskiPhD) #2081 +- [micromamba] fix direct hook for powershell #2122 +- [libmamba] Fix libmamba CMake config file after dependency change (thanks @l2dy) #2091 +- [micromamba] fixes for ssl init and static build #2076 + +Enhancements + +- [libmamba] Add safe signed/unsigned conversion (thanks @AntoinePrv) #2087 +- [libmamba] Move to fmt::terminal_color and other output IO improvements & drop termcolor (thanks @AntoinePrv) #2085 +- [libmamba, micromamba] Handle non leaf conflicts (thanks @AntoinePrv) #2133 +- [libmamba, micromamba] Bind SAT error messages to python (thanks @AntoinePrv) #2127 +- [libmamba, micromamba] Nitpicking error messages (thanks @AntoinePrv) #2121 +- [libmamba, micromamba] Tree error message improvements (thanks @AntoinePrv) #2093 +- [libmamba, micromamba] Tree error message (thanks @AntoinePrv) #2064 +- [libmamba, micromamba] Add experimental flag for error messages (thanks @AntoinePrv) #2080 +- [libmamba, micromamba] Handle non leaf conflicts (thanks @AntoinePrv) #2133 +- [mamba] fix: Don't print banner in quiet mode (thanks @corneliusroemer) #2097 +- [all] ci: Update pre-commit-config #2092 +- [all] docs: Add warning to manual install instructions #2100 +- [all] docs: Consistently use curl for fetching files #2126 + + 2022.11.01 ========== diff --git a/libmamba/CHANGELOG.md b/libmamba/CHANGELOG.md index 0379a0c82f..7e1f8e7c46 100644 --- a/libmamba/CHANGELOG.md +++ b/libmamba/CHANGELOG.md @@ -1,3 +1,27 @@ +libmamba 1.1.0 (November 25, 2022) +================================== + +Some bugfixes for 1.0 and experimental release of the new solver messages + +Bug fixes + +- Fix libmamba CMake config file after dependency change (thanks @l2dy) #2091 + +Enhancements + +- Add safe signed/unsigned conversion (thanks @AntoinePrv) #2087 +- Move to fmt::terminal_color and other output IO improvements & drop termcolor (thanks @AntoinePrv) #2085 +- Handle non leaf conflicts (thanks @AntoinePrv) #2133 +- Bind SAT error messages to python (thanks @AntoinePrv) #2127 +- Nitpicking error messages (thanks @AntoinePrv) #2121 +- Tree error message improvements (thanks @AntoinePrv) #2093 +- Tree error message (thanks @AntoinePrv) #2064 +- Add experimental flag for error messages (thanks @AntoinePrv) #2080 +- Handle non leaf conflicts (thanks @AntoinePrv) #2133 +- ci: Update pre-commit-config #2092 +- docs: Add warning to manual install instructions #2100 +- docs: Consistently use curl for fetching files #2126 + libmamba 1.0.0 (November 01, 2022) ================================== diff --git a/libmamba/include/mamba/version.hpp b/libmamba/include/mamba/version.hpp index 455f0c7653..2b492cae6c 100644 --- a/libmamba/include/mamba/version.hpp +++ b/libmamba/include/mamba/version.hpp @@ -11,7 +11,7 @@ #include #define LIBMAMBA_VERSION_MAJOR 1 -#define LIBMAMBA_VERSION_MINOR 0 +#define LIBMAMBA_VERSION_MINOR 1 #define LIBMAMBA_VERSION_PATCH 0 // Binary version diff --git a/libmambapy/CHANGELOG.md b/libmambapy/CHANGELOG.md index 04b6b0d9ff..95ce0e8bb3 100644 --- a/libmambapy/CHANGELOG.md +++ b/libmambapy/CHANGELOG.md @@ -1,3 +1,14 @@ +libmambapy 1.1.0 (November 25, 2022) +==================================== + +Some bugfixes for 1.0 and experimental release of the new solver messages + +Enhancements + +- ci: Update pre-commit-config #2092 +- docs: Add warning to manual install instructions #2100 +- docs: Consistently use curl for fetching files #2126 + libmambapy 1.0.0 (November 01, 2022) ==================================== diff --git a/libmambapy/libmambapy/_version.py b/libmambapy/libmambapy/_version.py index 17954f67c2..9260b35475 100644 --- a/libmambapy/libmambapy/_version.py +++ b/libmambapy/libmambapy/_version.py @@ -1,2 +1,2 @@ -version_info = (1, 0, 0) +version_info = (1, 1, 0) __version__ = ".".join(map(str, version_info)) diff --git a/libmambapy/src/main.cpp b/libmambapy/src/main.cpp index f6dedbb1fa..a242d9f20d 100644 --- a/libmambapy/src/main.cpp +++ b/libmambapy/src/main.cpp @@ -215,7 +215,7 @@ PYBIND11_MODULE(bindings, m) .def("solve", [](MSolver& self) { - deprecated("Solver.solve is deprecated, use try_solve or must_solve instead"); + // TODO figure out a better interface return self.try_solve(); }) .def("try_solve", &MSolver::try_solve) diff --git a/mamba/CHANGELOG.md b/mamba/CHANGELOG.md index 76e0f5f758..5705a198e1 100644 --- a/mamba/CHANGELOG.md +++ b/mamba/CHANGELOG.md @@ -1,3 +1,19 @@ +mamba 1.1.0 (November 25, 2022) +=============================== + +Some bugfixes for 1.0 and experimental release of the new solver messages + +Bug fixes + +- Fix activate/deactivate in fish shell (thanks @psobolewskiPhD) #2081 + +Enhancements + +- fix: Don't print banner in quiet mode (thanks @corneliusroemer) #2097 +- ci: Update pre-commit-config #2092 +- docs: Add warning to manual install instructions #2100 +- docs: Consistently use curl for fetching files #2126 + mamba 1.0.0 (November 01, 2022) =============================== diff --git a/mamba/mamba/_version.py b/mamba/mamba/_version.py index 17954f67c2..9260b35475 100644 --- a/mamba/mamba/_version.py +++ b/mamba/mamba/_version.py @@ -1,2 +1,2 @@ -version_info = (1, 0, 0) +version_info = (1, 1, 0) __version__ = ".".join(map(str, version_info)) diff --git a/micromamba/CHANGELOG.md b/micromamba/CHANGELOG.md index 88adef3848..ef8421fbf8 100644 --- a/micromamba/CHANGELOG.md +++ b/micromamba/CHANGELOG.md @@ -1,3 +1,27 @@ +micromamba 1.1.0 (November 25, 2022) +==================================== + +Some bugfixes for 1.0 and experimental release of the new solver messages + +Bug fixes + +- Fix fish scripts (thanks @JafarAbdi, @raj-magesh, @jonashaag) #2101 +- fix direct hook for powershell #2122 +- fixes for ssl init and static build #2076 + +Enhancements + +- Handle non leaf conflicts (thanks @AntoinePrv) #2133 +- Bind SAT error messages to python (thanks @AntoinePrv) #2127 +- Nitpicking error messages (thanks @AntoinePrv) #2121 +- Tree error message improvements (thanks @AntoinePrv) #2093 +- Tree error message (thanks @AntoinePrv) #2064 +- Add experimental flag for error messages (thanks @AntoinePrv) #2080 +- Handle non leaf conflicts (thanks @AntoinePrv) #2133 +- ci: Update pre-commit-config #2092 +- docs: Add warning to manual install instructions #2100 +- docs: Consistently use curl for fetching files #2126 + micromamba 1.0.0 (November 01, 2022) ==================================== diff --git a/micromamba/src/version.hpp b/micromamba/src/version.hpp index b364e737a3..379c845f27 100644 --- a/micromamba/src/version.hpp +++ b/micromamba/src/version.hpp @@ -11,7 +11,7 @@ #include #define UMAMBA_VERSION_MAJOR 1 -#define UMAMBA_VERSION_MINOR 0 +#define UMAMBA_VERSION_MINOR 1 #define UMAMBA_VERSION_PATCH 0 // Binary version diff --git a/releaser.py b/releaser.py index 8db54dd56e..085b64699f 100644 --- a/releaser.py +++ b/releaser.py @@ -66,16 +66,16 @@ def commands(changes): files_to_commit += f" {templates[c][:-len('.tmpl')]} \\\n" files_to_commit = files_to_commit[:-3] - files_to_revert = "" for c in changes: files_to_commit += f" {templates[c][:-len('.tmpl')]} \\\n" print("\n\n--- REVERT ---\n\n") - print(f"git checkout origin/master -- \\\n{files_to_commit[:-3]}\n\n") + print(f"git checkout origin/main -- \\\n{files_to_commit[:-3]}\n\n") print("\n\n--- COMMIT ---\n\n") print("pre-commit run --all") print("git diff") - print(f"git commit -m 'release {commit_msg}' \\\n{files_to_revert}") + files_to_commit += " CHANGELOG.md \\\n" + print(f"git commit -m 'release {commit_msg}' \\\n{files_to_commit[:-3]}") print(f"git tag {date_stamp}") for c in changes: