use winreg from conda-forge

.github/workflows/main.yml

@@ -317,7 +317,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016]
+        os: [windows-latest]
         python-version: ["3.7"]
 
     steps:
@@ -403,7 +403,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016]
+        os: [windows-latest]
         python-version: ["3.7"]
 
     steps:
@@ -445,7 +445,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016]
+        os: [windows-latest]
         python-version: ["3.7"]
 
     steps:
@@ -495,7 +495,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016]
+        os: [windows-latest]
         python-version: ["3.7"]
 
     steps:
@@ -540,7 +540,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016]
+        os: [windows-latest]
         python-version: ["3.7"]
 
     steps:
@@ -583,7 +583,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2016]
+        os: [windows-latest]
         python-version: ["3.7"]
 
     steps:

libmamba/CMakeLists.txt

@@ -118,10 +118,6 @@ set(LIBMAMBA_SOURCES
     ${LIBMAMBA_SOURCE_DIR}/api/update.cpp
 )
 
-set(LIBMAMBA_THIRD_PARTIES
-    ${LIBMAMBA_SOURCE_DIR}/thirdparty/WinReg.hpp
-)
-
 set(LIBMAMBA_HEADERS
     ${LIBMAMBA_INCLUDE_DIR}/mamba/version.hpp
     # Core API (low-level)
@@ -191,7 +187,7 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
 
     # Output
     # ======
-    add_library(${target_name} ${linkage_upper} ${LIBMAMBA_SOURCES} ${LIBMAMBA_HEADERS} ${LIBMAMBA_THIRD_PARTIES})
+    add_library(${target_name} ${linkage_upper} ${LIBMAMBA_SOURCES} ${LIBMAMBA_HEADERS})
 
     if (${deps_linkage_upper} STREQUAL "STATIC")
         message("   -> Statically linking against libmamba (static) dependencies")
@@ -349,10 +345,15 @@ macro(libmamba_create_target target_name linkage deps_linkage output_name)
             $<INSTALL_INTERFACE:include>
     )
 
-    # TODO: package WinReg header
+    if (WIN32)
+        find_path(WINREG_INCLUDE_DIR NAMES WinReg.hpp)
+    endif()
+
     target_include_directories(
         ${target_name}
-        PRIVATE ${LIBMAMBA_SOURCE_DIR}
+        PRIVATE
+            ${LIBMAMBA_SOURCE_DIR}
+            ${WINREG_INCLUDE_DIR}
     )
 
     if (UNIX)

libmamba/environment-dev.yml

@@ -19,3 +19,4 @@ dependencies:
   - termcolor-cpp
   - cli11
   - spdlog
+  - sel(win): winreg

libmamba/src/core/shell_init.cpp

@@ -19,7 +19,7 @@
 #include <reproc++/run.hpp>
 
 #ifdef _WIN32
-#include "thirdparty/WinReg.hpp"
+#include "WinReg.hpp"
 #endif
 
 namespace mamba

libmamba/src/core/util_os.cpp

@@ -24,7 +24,7 @@
 #include <windows.h>
 #include <intrin.h>
 #include <tlhelp32.h>
-#include "thirdparty/WinReg.hpp"
+#include "WinReg.hpp"
 #endif
 
 

libmambapy/environment-dev.yml

@@ -21,3 +21,4 @@ dependencies:
   - spdlog
   - pybind11
   - pytest
+  - sel(win): winreg

mamba/environment-dev.yml

@@ -22,3 +22,4 @@ dependencies:
   - pybind11
   - pytest
   - conda
+  - sel(win): winreg

micromamba/environment-dev.yml

@@ -22,3 +22,4 @@ dependencies:
   - pytest-lazy-fixture
   - pyyaml
   - spdlog
+  - sel(win): winreg