diff --git a/CHANGELOG.md b/CHANGELOG.md index c0303991c..c8b3c9977 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +2021.11.24 +========== + +Releases: libmamba 0.18.2, libmambapy 0.18.2, mamba 0.18.2, micromamba 0.18.2 + +Bug fixes +- [mamba, libmamba] Fix use of a read-only cache (@adriendelsalle) #1294 +- [mamba, libmamba] Fix dangling LockFiles (@adriendelsalle) #1290 +- [micromamba] Fix CMake config for micromamba fully statically linked on Windows (@adriendelsalle) #1297 +- [micromamba, libmamba] Fix shell activation regression (@adriendelsalle) #1289 + 2021.11.19 ========== diff --git a/libmamba/CHANGELOG.md b/libmamba/CHANGELOG.md index f788d7323..f6b4371b6 100644 --- a/libmamba/CHANGELOG.md +++ b/libmamba/CHANGELOG.md @@ -1,3 +1,12 @@ +libmamba 0.18.2 (November 24, 2021) +=================================== + +Bug fixes + +- Fix use of a read-only cache (@adriendelsalle) #1294 +- Fix dangling LockFiles (@adriendelsalle) #1290 +- Fix shell activation regression (@adriendelsalle) #1289 + 0.18.1 (November 19, 2021) ========================== diff --git a/libmamba/include/mamba/version.hpp b/libmamba/include/mamba/version.hpp index 24e8f3d3c..612d8d381 100644 --- a/libmamba/include/mamba/version.hpp +++ b/libmamba/include/mamba/version.hpp @@ -12,16 +12,22 @@ #define LIBMAMBA_VERSION_MAJOR 0 #define LIBMAMBA_VERSION_MINOR 18 -#define LIBMAMBA_VERSION_PATCH 1 +#define LIBMAMBA_VERSION_PATCH 2 // Binary version #define LIBMAMBA_BINARY_CURRENT 1 #define LIBMAMBA_BINARY_REVISION 0 #define LIBMAMBA_BINARY_AGE 0 +#define __LIBMAMBA_STRINGIZE_IMPL(s) #s +#define __LIBMAMBA_STRINGIZE(s) __LIBMAMBA_STRINGIZE_IMPL(s) + #define LIBMAMBA_VERSION \ (LIBMAMBA_VERSION_MAJOR * 10000 + LIBMAMBA_VERSION_MINOR * 100 + LIBMAMBA_VERSION_PATCH) -#define LIBMAMBA_VERSION_STRING "0.18.1" +#define LIBMAMBA_VERSION_STRING \ + __LIBMAMBA_STRINGIZE(LIBMAMBA_VERSION_MAJOR) \ + "." __LIBMAMBA_STRINGIZE(LIBMAMBA_VERSION_MINOR) "." __LIBMAMBA_STRINGIZE( \ + LIBMAMBA_VERSION_PATCH) namespace mamba { diff --git a/libmamba/include/mamba/version.hpp.tmpl b/libmamba/include/mamba/version.hpp.tmpl index 308e356e8..34402c445 100644 --- a/libmamba/include/mamba/version.hpp.tmpl +++ b/libmamba/include/mamba/version.hpp.tmpl @@ -10,9 +10,9 @@ #include #include -#define LIBMAMBA_VERSION_MAJOR 0 -#define LIBMAMBA_VERSION_MINOR 19 -#define LIBMAMBA_VERSION_PATCH 0 +#define LIBMAMBA_VERSION_MAJOR {{ version_major }} +#define LIBMAMBA_VERSION_MINOR {{ version_minor }} +#define LIBMAMBA_VERSION_PATCH {{ version_patch }} // Binary version #define LIBMAMBA_BINARY_CURRENT 1 @@ -20,13 +20,14 @@ #define LIBMAMBA_BINARY_AGE 0 #define __LIBMAMBA_STRINGIZE_IMPL(s) #s -#define __LIBMAMBA_STRINGIZE(s) STRINGIZE_IMPL(s) +#define __LIBMAMBA_STRINGIZE(s) __LIBMAMBA_STRINGIZE_IMPL(s) #define LIBMAMBA_VERSION \ (LIBMAMBA_VERSION_MAJOR * 10000 + LIBMAMBA_VERSION_MINOR * 100 + LIBMAMBA_VERSION_PATCH) -#define LIBMAMBA_VERSION_STRING __LIBMAMBA_STRINGIZE(LIBMAMBA_VERSION_MAJOR) "." \ - __LIBMAMBA_STRINGIZE(LIBMAMBA_VERSION_MINOR) "." \ - __LIBMAMBA_STRINGIZE(LIBMAMBA_VERSION_PATCH) +#define LIBMAMBA_VERSION_STRING \ + __LIBMAMBA_STRINGIZE(LIBMAMBA_VERSION_MAJOR) \ + "." __LIBMAMBA_STRINGIZE(LIBMAMBA_VERSION_MINOR) "." __LIBMAMBA_STRINGIZE( \ + LIBMAMBA_VERSION_PATCH) namespace mamba { diff --git a/libmambapy/CHANGELOG.md b/libmambapy/CHANGELOG.md index 0a53f86d0..61dfcb978 100644 --- a/libmambapy/CHANGELOG.md +++ b/libmambapy/CHANGELOG.md @@ -1,3 +1,7 @@ +libmambapy 0.18.2 (November 24, 2021) +===================================== + + 0.18.1 (November 19, 2021) ========================== diff --git a/libmambapy/libmambapy/_version.py b/libmambapy/libmambapy/_version.py index 1f140999c..87d85cfb6 100644 --- a/libmambapy/libmambapy/_version.py +++ b/libmambapy/libmambapy/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 18, 1) +version_info = (0, 18, 2) __version__ = ".".join(map(str, version_info)) diff --git a/mamba/CHANGELOG.md b/mamba/CHANGELOG.md index 3d6d4011f..079b929a7 100644 --- a/mamba/CHANGELOG.md +++ b/mamba/CHANGELOG.md @@ -1,3 +1,11 @@ +mamba 0.18.2 (November 24, 2021) +================================ + +Bug fixes + +- Fix use of a read-only cache (@adriendelsalle) #1294 +- Fix dangling LockFiles (@adriendelsalle) #1290 + 0.18.1 (November 19, 2021) ========================== diff --git a/mamba/mamba/_version.py b/mamba/mamba/_version.py index 1f140999c..87d85cfb6 100644 --- a/mamba/mamba/_version.py +++ b/mamba/mamba/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 18, 1) +version_info = (0, 18, 2) __version__ = ".".join(map(str, version_info)) diff --git a/micromamba/CHANGELOG.md b/micromamba/CHANGELOG.md index 87e38e037..4561cab3d 100644 --- a/micromamba/CHANGELOG.md +++ b/micromamba/CHANGELOG.md @@ -1,3 +1,11 @@ +micromamba 0.18.2 (November 24, 2021) +===================================== + +Bug fixes + +- Fix CMake config for micromamba fully statically linked on Windows (@adriendelsalle) #1297 +- Fix shell activation regression (@adriendelsalle) #1289 + 0.18.1 (November 19, 2021) ========================== diff --git a/micromamba/src/version.hpp b/micromamba/src/version.hpp index 77b09d65e..ae641718e 100644 --- a/micromamba/src/version.hpp +++ b/micromamba/src/version.hpp @@ -12,16 +12,21 @@ #define UMAMBA_VERSION_MAJOR 0 #define UMAMBA_VERSION_MINOR 18 -#define UMAMBA_VERSION_PATCH 1 +#define UMAMBA_VERSION_PATCH 2 // Binary version #define UMAMBA_BINARY_CURRENT 1 #define UMAMBA_BINARY_REVISION 0 #define UMAMBA_BINARY_AGE 0 +#define __UMAMBA_STRINGIZE_IMPL(s) #s +#define __UMAMBA_STRINGIZE(s) __UMAMBA_STRINGIZE_IMPL(s) + #define UMAMBA_VERSION \ (UMAMBA_VERSION_MAJOR * 10000 + UMAMBA_VERSION_MINOR * 100 + UMAMBA_VERSION_PATCH) -#define UMAMBA_VERSION_STRING "0.18.1" +#define UMAMBA_VERSION_STRING \ + __UMAMBA_STRINGIZE(UMAMBA_VERSION_MAJOR) \ + "." __UMAMBA_STRINGIZE(UMAMBA_VERSION_MINOR) "." __UMAMBA_STRINGIZE(UMAMBA_VERSION_PATCH) namespace umamba { diff --git a/micromamba/src/version.hpp.tmpl b/micromamba/src/version.hpp.tmpl index 5e638d8d8..93d8f8d42 100644 --- a/micromamba/src/version.hpp.tmpl +++ b/micromamba/src/version.hpp.tmpl @@ -20,13 +20,13 @@ #define UMAMBA_BINARY_AGE 0 #define __UMAMBA_STRINGIZE_IMPL(s) #s -#define __UMAMBA_STRINGIZE(s) STRINGIZE_IMPL(s) +#define __UMAMBA_STRINGIZE(s) __UMAMBA_STRINGIZE_IMPL(s) #define UMAMBA_VERSION \ (UMAMBA_VERSION_MAJOR * 10000 + UMAMBA_VERSION_MINOR * 100 + UMAMBA_VERSION_PATCH) -#define UMAMBA_VERSION_STRING __UMAMBA_STRINGIZE(UMAMBA_VERSION_MAJOR) "." \ - __UMAMBA_STRINGIZE(UMAMBA_VERSION_MINOR) "." \ - __UMAMBA_STRINGIZE(UMAMBA_VERSION_PATCH) +#define UMAMBA_VERSION_STRING \ + __UMAMBA_STRINGIZE(UMAMBA_VERSION_MAJOR) \ + "." __UMAMBA_STRINGIZE(UMAMBA_VERSION_MINOR) "." __UMAMBA_STRINGIZE(UMAMBA_VERSION_PATCH) namespace umamba { diff --git a/releaser.py b/releaser.py index c6f9be57b..94d1fba1f 100644 --- a/releaser.py +++ b/releaser.py @@ -5,27 +5,6 @@ import re template = {"version": None, "changes": []} - -def append_element(selector, element, releases, islist, result): - element = element.strip() - - def def_el(a, x): - if not a: - return - if islist: - x = f"- {x}" - result[a]["changes"].append(x) - - selector = selector.strip() - s = [x.strip() for x in selector.split(",")] - if "all" in s: - for r in releases: - def_el(r, element) - else: - for el in s: - def_el(el, element) - - templates = { "libmamba": "libmamba/include/mamba/version.hpp.tmpl", "micromamba": "micromamba/src/version.hpp.tmpl", @@ -75,6 +54,7 @@ def apply_changelog(name, version, changes): def commands(changes): + print("pre-commit run --all") print("git diff") commit_msg = ", ".join([f"{x} {changes[x]['version']}" for x in changes]) @@ -128,6 +108,7 @@ def populate_changes(name, sections, changes): if applies(i.applies_to): el["changes"].append(f"- {i.text.strip()}") + def main(): changes = {} with open("CHANGELOG.md", "r") as fi: @@ -172,14 +153,13 @@ def main(): if m := re.search(brackets_re, c): if in_section: - sections[-1].applies_to(m.groups(1)[0]) + sections[-1].applies_to = [x.strip() for x in m.groups(1)[0].split(",")] else: sections[-1].items.append(Item()) sections[-1].items[-1].text = c[m.end() :].strip() - sections[-1].items[-1].applies_to = m.groups(1)[0] - - # if len(change_el): - # append_element(groups, change_el, release_names, islist, changes) + sections[-1].items[-1].applies_to = [ + x.strip() for x in m.groups(1)[0].split(",") + ] else: if c.startswith(" "): @@ -191,7 +171,7 @@ def main(): if not in_section: sections[-1].items.append(Item()) sections[-1].items[-1].text = c.strip() - sections[-1].items[-1].applies_to = "all" + sections[-1].items[-1].applies_to = ["all"] for c in changes: populate_changes(c, sections, changes)