Commit c1021ec2 authored Dec 16, 2024 by kelvinrr

Merge branch 'main' of github.com:DOI-USGS/SpiceQL

parents 8d496aad d3de2a88

.gitmodules

+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

CHANGELOG.md

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,7 +35,10 @@ release.

		## [Unreleased]

		## 1.0

		### Added

		- Adds support for LO [#11](https://github.com/DOI-USGS/SpiceQL/issues/11)
		- Adds support for Smart1 [#16](https://github.com/DOI-USGS/SpiceQL/issues/16)
		- Adds support for Hayabusa2 ONC [#12](https://github.com/DOI-USGS/SpiceQL/issues/12)

SpiceQL/src/inventoryimpl.cpp

+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>

bindings/python/CMakeLists.txt

+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

redis-plus-plus @ afa0e3fc

Original line number	Diff line number	Diff line
		Subproject commit afa0e3fcf131f91836bb060ead12b9171ed40a64