Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
afa13b5
Added history comment.
AustinSanders Nov 6, 2019
e4bbcad
Initial move to core
Oct 16, 2020
07e63f6
Removed Pvl cmakelists
Oct 16, 2020
01559c7
Removed more cmakelists.txt
Oct 16, 2020
4d28299
Add subdirectory
Oct 16, 2020
bf4da22
Fully modularized core
AustinSanders Oct 22, 2020
46a5445
Fully modularized core
AustinSanders Oct 22, 2020
37e95a5
replaced PvlEditDialog that was accidentally removed in prev commit
AustinSanders Oct 22, 2020
3101e26
Initial constants unit gtest
AustinSanders Oct 23, 2020
a799993
Fixed pvl core test config (#4349)
jessemapel Mar 10, 2021
531ada4
Fixed pvl core test config
jessemapel Mar 9, 2021
25d8dc6
Changed cmake_source to project_source for submodule
jessemapel Mar 9, 2021
3d371fc
First working swig wrappers
AustinSanders Mar 10, 2021
c4e4c8d
Rebased off of pvl_core
AustinSanders Mar 10, 2021
6884740
Moved old ISIS unitTests into core (#4351)
jessemapel Mar 11, 2021
8180eec
Finished swig wrapper with some syntax sugar for ease of use in pytho…
acpaquette Mar 12, 2021
0ba964a
Initial core deployment (#4355)
AustinSanders Mar 12, 2021
5f56950
Updated preference files (#4354)
jessemapel Mar 12, 2021
e4b3fe2
Reset main build and created core recipe
acpaquette Jun 9, 2021
66d01a4
Changed pvl recipe url to point to usgsastro
acpaquette Jun 9, 2021
a1b4189
Fixed typo
acpaquette Jun 9, 2021
b71744b
Removed a chunk of files that made it through the rebase (#4523)
acpaquette Jun 10, 2021
fb4c3cc
Add Blob to core from base (#4525)
Jun 14, 2021
88fa1f8
Pvl core Docs (#4536)
acpaquette Jun 17, 2021
03c4429
Blob Swig Wrapper (#4613)
acpaquette Sep 6, 2021
b29c744
Post rebase fixes
acpaquette Jul 7, 2023
461b67a
Fixed app logging for all call able apps
acpaquette Jul 17, 2023
d928c9e
Moved table reading/writing into core
acpaquette Jul 17, 2023
51dd744
Fixed missing license identifiers, and leftover merge conflict from r…
acpaquette Jul 20, 2023
d1b323b
Removed unnecessary includes to classes outside of core
acpaquette Jul 20, 2023
8da6b9c
Removed tempFixtures include in core tests
acpaquette Jul 20, 2023
21804b6
Updates sources and includes for building
acpaquette Jul 20, 2023
6af0ef9
Moves necessary fixtures into core
acpaquette Jul 20, 2023
46c6a9c
Enforce that core unit tests use the test preferences
acpaquette Jul 20, 2023
d270638
Removed commented Application::Name all
acpaquette Jul 20, 2023
62f26bf
Initial round of test fixes
acpaquette Jul 21, 2023
5bf9809
Updated IException test truth data
acpaquette Jul 24, 2023
5f0cc1e
Moved Endian into core
acpaquette Jul 26, 2023
574bc06
Remove additional 'm' extension for python 3.10
acpaquette Jul 26, 2023
3a83e5f
Set version to 0.0.1 and clamped qt bellow 5.15
acpaquette Jul 26, 2023
f5bf8f1
Initial changes for isis pvl python interface
acpaquette Aug 14, 2023
733f2f5
Removed prints causing test failures
acpaquette Oct 4, 2023
80495d3
Update version to 1.0.0
acpaquette Oct 10, 2023
1b4b0d4
Added cxx-compiler as a build dependency
acpaquette Oct 10, 2023
1bea711
Added mesalib as a build and run dependency
acpaquette Oct 10, 2023
6071d4d
Changed all Endian.h to IEndian.h to prevent include shadowing in a c…
acpaquette Oct 11, 2023
c9bfb22
Fixed python find for python 3.9
acpaquette Oct 11, 2023
f8f3dbb
Fix python find for 3.11
acpaquette Oct 11, 2023
c06e796
Changed mention of isisio to isiscore
acpaquette Oct 12, 2023
ae42e41
Forgot to add name changed file
acpaquette Oct 12, 2023
acefbb3
Add install command for python bindings
acpaquette Oct 13, 2023
2f95124
rebase fixes and fixed PvlKeywordTest
amystamile-usgs Jan 31, 2025
0d3bab9
more rebase fixes
amystamile-usgs Jan 31, 2025
0f05211
Updated core_recipe
amystamile-usgs Feb 3, 2025
2ca81b1
Fix latest release version
amystamile-usgs Feb 3, 2025
6338ec1
conda-forge updates
amystamile-usgs Feb 4, 2025
33ca10f
more conda-forge updates
amystamile-usgs Feb 5, 2025
9527cf7
working conda-forge changes
amystamile-usgs Feb 6, 2025
15d3a81
Updated core preference files to match the base preference files
acpaquette Sep 4, 2025
d77f781
Updated Blob tests and changed how Isis/TestPreferences are added to …
acpaquette Sep 9, 2025
d3aef56
Removed old blob tests
acpaquette Sep 9, 2025
cbd926e
Removed blob unitTest in CmakeLists.txt
acpaquette Sep 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# Unignore all dirs
!*/

# Unignore Makefiles, and TestPreferences
# Unignore Makefiles, IsisPreferences, and TestPreferences
!Makefile
!TestPreferences
!IsisPreferences
!*/3rdParty/Makefile

# Unignore version file
Expand Down
8 changes: 8 additions & 0 deletions core_recipe/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
mkdir build_core
cd build_core
export ISISROOT=$PWD

cmake -GNinja -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DISIS_BUILD_SWIG=ON -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis/src/core
ninja install
cd swig/python/
${PYTHON} setup.py install
54 changes: 54 additions & 0 deletions core_recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{% set version = "9.0.0" %}
{% set build_number = "0" %}

package:
name: isiscore
version: {{ version }}

source:
url: https://github.com/DOI-USGS/ISIS3/archive/{{ version }}.tar.gz
sha256: 394ba889ceef5aaebc25e0e28f084209defb2c724e291ab86a587181bf095c7a
# git_url: https://github.com/DOI-USGS/ISIS3.git
# git_branch: new_pvl_core

build:
skip: true # [win]
number: {{ build_number }}

requirements:
build:
- {{ compiler("cxx") }}
- {{ stdlib("c") }}
- cmake >=3.27,<3.28
- gdal
- ninja
- python =3.11
- setuptools
host:
- gdal
- mesalib
- nlohmann_json
- python =3.11
- qt-main >=5.15.8, <5.16
- setuptools
- swig
run:
- python =3.11
- {{ pin_compatible('qt-main', max_pin='x.x') }}
- {{ pin_compatible('nlohmann_json', min_pin='x.x.x', max_pin='x.x.x') }}

test:
commands:
- test -e $PREFIX/lib/libcore${SHLIB_EXT}
- test -e $PREFIX/include/isis/Pvl.h

about:
home: https://github.com/DOI-USGS/ISIS3
license: CC0-1.0
license_file: LICENSE.md
summary: "ISIS Core"

extra:
recipe-maintainers:
- amystamile-usgs
- acpaquette
11 changes: 6 additions & 5 deletions isis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ option(buildStaticCore "Build libisis static as well as dynamic" OFF )
option(buildTests "Set up unit, application, and module tests." ON )
option(buildDocs "Build the docs." ON )
option(JP2KFLAG "Whether or not to build using JPEG2000 support" OFF )
option(pybindings "Turn on to build Python bindings" ON )
option(pybindings "Turn on to build Python bindings" ON )
option(ISIS_BUILD_SWIG "Turn on to build swig wrappers" OFF )
option(BUILD_CORE_TESTS "Turn on to build core tests" ON )

# if cmake install prefix is not set, and conda env is activated, use the
# conda env as the install directory.
Expand Down Expand Up @@ -142,6 +144,8 @@ message("\tBUILD TESTS: ${buildTests}")
message("\tBUILD DOCS: ${buildDocs}")
message("\tBUILD CORE: ${buildCore}")
message("\tBUILD MISSIONS: ${buildMissions}")
message("\tBUILD CORE TESTS: ${BUILD_CORE_TESTS}")
message("\tBUILD SWIG: ${ISIS_BUILD_SWIG}")
message("\tJP2K SUPPORT: ${JP2KFLAG}")
message("\tPYTHON BINDINGS: ${pybindings}")
message("\tISISDATA: ${isisData}")
Expand Down Expand Up @@ -203,6 +207,7 @@ endif()
# Flag to fix numeric literals problem with boost on linux
# Add gold linker (and therefore, phtread) to speed up linux (spec. Ubuntu18.04) builds
if(NOT APPLE)
message("$ENV{CONDA_PREFIX}")
set(thirdPartyCppFlags ${thirdPartyCppFlags} -fuse-ld=gold
-pthread
-fext-numeric-literals
Expand Down Expand Up @@ -423,8 +428,6 @@ endif()
install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis${VERSION}${SO})")
install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis${VERSION_MAJOR}.${VERSION_MINOR}${SO})")
install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis${VERSION_MAJOR}${SO})")
EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/TestPreferences ${CMAKE_BINARY_DIR}/)
install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/IsisPreferences ${CMAKE_INSTALL_PREFIX}/)")

# Install the header files
install(CODE "EXECUTE_PROCESS(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/include/isis)")
Expand Down Expand Up @@ -618,13 +621,11 @@ add_dependencies(isis cameraPlugins)
add_custom_target(clean_source COMMAND rm -rf "${CMAKE_BINARY_DIR}/*" "${CMAKE_INSTALL_PREFIX}/*")

# Set up a few top level files for installation.
EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/IsisPreferences ${CMAKE_BINARY_DIR})
EXECUTE_PROCESS(COMMAND cp -rf ${CMAKE_SOURCE_DIR}/scripts ${CMAKE_BINARY_DIR})
EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/../LICENSE.md ${CMAKE_BINARY_DIR})
EXECUTE_PROCESS(COMMAND cp -rf ${CMAKE_SOURCE_DIR}/make ${CMAKE_BINARY_DIR})

# Copy the files on make install as well
install(FILES ${CMAKE_SOURCE_DIR}/IsisPreferences DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${CMAKE_SOURCE_DIR}/../LICENSE.md DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${CMAKE_SOURCE_DIR}/../AUTHORS.rst DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${CMAKE_SOURCE_DIR}/../CHANGELOG.md DESTINATION ${CMAKE_INSTALL_PREFIX})
Expand Down
Loading