Unverified Commit d3de2a88 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

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
parent ace54b63
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
#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>
+1 −1
Original line number Diff line number Diff line
@@ -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})")
 No newline at end of file
install(CODE "execute_process(COMMAND pip install . WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 No newline at end of file
Compare afa0e3fc to afa0e3fc
Original line number Diff line number Diff line
Subproject commit afa0e3fcf131f91836bb060ead12b9171ed40a64