Conda forge fixes (#47)

* fixed bug where cks were using interval scope * added a fix for conda-forge * more fixes for conda-forge * changed install command * removed CXX line * removed redis submodule
DOI-USGS · Nov 4, 2024 · d3de2a8 · d3de2a8
1 parent ace54b6
commit d3de2a8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,9 +14,6 @@
 	path = extern/pybind11
 	url = ../../pybind/pybind11
 	branch = stable
-[submodule "submodules/redis-plus-plus"]
-	path = submodules/redis-plus-plus
-	url = https://github.com/sewenew/redis-plus-plus.git
 [submodule "submodules/BTree"]
 	path = submodules/BTree
 	url = https://github.com/frozenca/BTree.git
diff --git a/SpiceQL/src/inventoryimpl.cpp b/SpiceQL/src/inventoryimpl.cpp
@@ -1,6 +1,8 @@
 #include <iostream>
 #include <regex>
 
+// we need to include this to overwrite and other std::fs imports
+#include <ghc/fs_std.hpp>
 #include <nlohmann/json.hpp>
 #include <fc/btree.h>
 #include <fc/disk_btree.h>

diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -45,4 +45,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py
                COPYONLY)
 
 # Setup to run setup tools on install 
-install(CODE "execute_process(COMMAND python -m pip install -e . WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
+install(CODE "execute_process(COMMAND pip install . WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
diff --git a/submodules/redis-plus-plus b/submodules/redis-plus-plus