Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRAFT: ISIS IO Remove QT Dep #5610

Closed
wants to merge 95 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
75a7a26
Added history comment.
AustinSanders Nov 6, 2019
7408dc7
Initial move to core
Oct 16, 2020
5f3cfd0
Removed Pvl cmakelists
Oct 16, 2020
0751b38
Removed more cmakelists.txt
Oct 16, 2020
acdc7ee
Add subdirectory
Oct 16, 2020
1ca6ec0
Fully modularized core
AustinSanders Oct 22, 2020
4dc859f
Fully modularized core
AustinSanders Oct 22, 2020
d73eac9
replaced PvlEditDialog that was accidentally removed in prev commit
AustinSanders Oct 22, 2020
04842ba
Initial constants unit gtest
AustinSanders Oct 23, 2020
674dd72
Fixed pvl core test config (#4349)
jessemapel Mar 10, 2021
766a0ae
Fixed pvl core test config
jessemapel Mar 9, 2021
bc76f7a
Changed cmake_source to project_source for submodule
jessemapel Mar 9, 2021
013b771
First working swig wrappers
AustinSanders Mar 10, 2021
6f53672
Rebased off of pvl_core
AustinSanders Mar 10, 2021
0e03712
Moved old ISIS unitTests into core (#4351)
jessemapel Mar 11, 2021
7e71f5a
Finished swig wrapper with some syntax sugar for ease of use in pytho…
acpaquette Mar 12, 2021
48a92e6
Initial core deployment (#4355)
AustinSanders Mar 12, 2021
5e504eb
Updated preference files (#4354)
jessemapel Mar 12, 2021
c63d653
Reset main build and created core recipe
acpaquette Jun 9, 2021
a4a963d
Changed pvl recipe url to point to usgsastro
acpaquette Jun 9, 2021
486a28a
Fixed typo
acpaquette Jun 9, 2021
dffc56e
Removed a chunk of files that made it through the rebase (#4523)
acpaquette Jun 10, 2021
1958af6
Add Blob to core from base (#4525)
scsides Jun 14, 2021
f5002a0
Pvl core Docs (#4536)
acpaquette Jun 17, 2021
fefc9f9
Blob Swig Wrapper (#4613)
acpaquette Sep 6, 2021
da239b3
Post rebase fixes
acpaquette Jul 7, 2023
ef3612c
Fixed app logging for all call able apps
acpaquette Jul 17, 2023
31f0845
Moved table reading/writing into core
acpaquette Jul 17, 2023
774abeb
Fixed missing license identifiers, and leftover merge conflict from r…
acpaquette Jul 20, 2023
7a5959f
Removed unnecessary includes to classes outside of core
acpaquette Jul 20, 2023
76a5745
Removed tempFixtures include in core tests
acpaquette Jul 20, 2023
ae92738
Updates sources and includes for building
acpaquette Jul 20, 2023
e74c69c
Moves necessary fixtures into core
acpaquette Jul 20, 2023
612ebec
Enforce that core unit tests use the test preferences
acpaquette Jul 20, 2023
c124f24
Removed commented Application::Name all
acpaquette Jul 20, 2023
f8eac13
Initial round of test fixes
acpaquette Jul 21, 2023
03cdf0e
Updated IException test truth data
acpaquette Jul 24, 2023
3e353ce
Moved Endian into core
acpaquette Jul 26, 2023
cf8a1de
Remove additional 'm' extension for python 3.10
acpaquette Jul 26, 2023
2c89869
Set version to 0.0.1 and clamped qt bellow 5.15
acpaquette Jul 26, 2023
825e725
Initial changes for isis pvl python interface
acpaquette Aug 14, 2023
443d460
Removed prints causing test failures
acpaquette Oct 4, 2023
0324026
QPair -> std::pair
amystamile-usgs Oct 11, 2023
32c487c
removed QT from ArraySubscriptNotInRange
amystamile-usgs Oct 11, 2023
d02d74c
removed QT from Message::Keyword*
amystamile-usgs Oct 11, 2023
2889ee9
Updated MissingDelimiter.cpp and deps
amystamile-usgs Oct 12, 2023
b19b4c5
Updated MemoryAllocFailed
amystamile-usgs Oct 12, 2023
97088ed
compiling updates
amystamile-usgs Oct 16, 2023
1de2c68
PvlSequence updated
amystamile-usgs Oct 16, 2023
51c42f8
Updated table, tablefield, and tablerecord
amystamile-usgs Oct 18, 2023
3337b38
large chunk of PVL updates
amystamile-usgs Oct 26, 2023
f949307
more pvl updates
amystamile-usgs Oct 27, 2023
06c471b
more PVL updates
amystamile-usgs Oct 30, 2023
32ee89e
Remove qt deps (#5313)
amystamile-usgs Oct 19, 2023
8c4d685
pvl remove qt changes
Aug 16, 2024
2e38188
more removal of qt from pvl
amystamile-usgs Aug 20, 2024
4a38f6f
Removed qt from FileName.cpp
amystamile-usgs Aug 28, 2024
f19a207
Removed QStrings from IString in ISIS core
acpaquette Aug 23, 2024
e28401c
Remove final QString elements from IString
acpaquette Sep 3, 2024
6abf3d4
Initial propogation of IString changes
acpaquette Sep 4, 2024
5efcaa4
Change in progress
amystamile-usgs Sep 6, 2024
ac54764
Updated base objects
amystamile-usgs Sep 9, 2024
866825b
Updated base apps
amystamile-usgs Sep 9, 2024
ed277dc
Updated core tests
amystamile-usgs Sep 9, 2024
e530fb1
updated control and database files
amystamile-usgs Sep 10, 2024
d5cbace
Updated qisis files
amystamile-usgs Sep 11, 2024
b6744b3
updated remaining obj and app files
amystamile-usgs Sep 12, 2024
2a47fb0
updated base unit tests
amystamile-usgs Sep 13, 2024
bd2b832
more updates
amystamile-usgs Sep 16, 2024
bcffcb8
More updates
amystamile-usgs Sep 17, 2024
e1fc03b
Updated std::to* calls to Isis::to* calls
AustinSanders Sep 17, 2024
70b1818
Updated type of m_keywords from std::vector to std::list
AustinSanders Sep 17, 2024
16e5807
Changed std::to* calls to Isis::to* calls
AustinSanders Sep 17, 2024
6a611fd
Removed bracket from regex
AustinSanders Sep 17, 2024
4206cb5
Removed line that adds unnecessary whitespace to comments
AustinSanders Sep 17, 2024
1d756f1
fixed pvl iterators
amystamile-usgs Sep 18, 2024
ab0d5e9
final updates
amystamile-usgs Sep 18, 2024
6cfc115
Updated recent merged changes
amystamile-usgs Sep 18, 2024
2c5c712
Fix linux errors
amystamile-usgs Sep 19, 2024
eba222c
JP2 changes
amystamile-usgs Sep 19, 2024
680a8ca
Fixes ThreeImageNetwork segfaults
amystamile-usgs Sep 20, 2024
90056e1
seg fault fix
amystamile-usgs Sep 20, 2024
48b15b9
rebase fixes
amystamile-usgs Sep 21, 2024
10639e1
Convert std:: to IString - fixes formating test errors
amystamile-usgs Sep 23, 2024
0ad7f33
fixes segfaults
amystamile-usgs Sep 24, 2024
c1a3c61
fixed gtests part 1
amystamile-usgs Sep 25, 2024
4db0a28
fixed gtest part 2
amystamile-usgs Sep 26, 2024
0775a1f
Update std::tostring, stoi, stod to IString functions
AustinSanders Sep 23, 2024
db26f69
Updated formatting for tests
AustinSanders Sep 26, 2024
483fb4b
Fix unit tests
AustinSanders Sep 27, 2024
dd11f80
Fixed unit test
AustinSanders Sep 27, 2024
edfe874
fixed gtests part 3
amystamile-usgs Sep 30, 2024
9346e66
Rebase updates
amystamile-usgs Jan 27, 2025
b8037ec
Fixed tests from rebase
amystamile-usgs Jan 27, 2025
d432331
kerneldb test fixes
amystamile-usgs Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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 @@
#!/bin/bash
mkdir build
cd build
export ISISROOT=$PWD
cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DKAKADU_INCLUDE_DIR=/isisData/kakadu -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DISIS_BUILD_SWIG=ON -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis/src/core
ninja install
cd ${SRC_DIR}/build/swig/python
python setup.py install
70 changes: 70 additions & 0 deletions core_recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# When building ISIS for a public release, be sure that these variables are properly set to reflect
# your current build. Keep in mind that these values are how conda build names its .tar.bz2 build
# file, and so must be unique to other builds sitting in the USGS-Astrogeology channel on Anaconda
# Cloud, or they will be overwritten when you upload this current build. It is always a good idea to
# confirm that you will not be overwriting a file that has already been uploaded by checking the
# channel before building.

# Also keep in mind that there must already be a Release or a Tag by the name <version>_<build_number>
# on the USGS-Astrogeology/ISIS3 repo before invoking the conda build system as this will pull the
# tar.gz of that name to build. After pushing changes for a release build (so as to
# include these changes in the release), but before building using the conda build system, be
# sure to create this Release or Tag.

# This is the version of ISIS that you are building. (Please refer to
# RFC2 (https://github.com/USGS-Astrogeology/ISIS3/wiki/RFC2:-Release-Process) if you are not sure
# about what version you are building.)
# Examples:
# A Public Release for ISIS3.6.1: {% set version = "3.6.1" %}
# A Release Candidate for ISIS3.6.1: {% set version = "3.6.1_RC" %}
# A custom build of ISIS3.6.1 for the CaSSIS mission: {% set version = "3.6.1_cassis" %}
{% set version = "0.0.1" %}

# This is the build number for the current version you are building. If this is the first build of
# this version, the build number will be 0. It is incremented by 1 with every consecutive build of
# the same version.
{% set build_number = "0" %}

package:
name: isisio
version: {{ version }}

source:
git_url: 'https://github.com/USGS-Astrogeology/ISIS3.git'
git_tag: 'pvl_core'

# url: 'https://github.com/USGS-Astrogeology/ISIS3/archive/{{ version }}.tar.gz'
# sha256 is the prefered checksum -- you can get it for a file with:
# `openssl sha256 <file name>`. Simply run this command with the .tar.gz
# file specified in the "url" tag above.
# sha256: '62b88bec88471588feb581e28afc2aa9248bd4e165ad83c448a4c5fa7b59a6e1'

build:
number: {{ build_number }}

# Shotgun strat on requirements until we can narrow them down
requirements:
build:
- cmake >=3.15
- ninja
- nlohmann_json
- python
- qt >=5.9.6,<5.15.0
- swig
run:
- nlohmann_json
- {{ pin_compatible('qt', max_pin='x.x') }}

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


about:
home: https://github.com/USGS-Astrogeology/ISIS3
license: CC0-1.0
license_file: LICENSE.md
summary: "Integrated Software for Imagers and Spectrometers"
5 changes: 5 additions & 0 deletions isis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ option(buildStaticCore "Build libisis static as well as dynamic" OFF )
option(buildTests "Set up unit, application, and module tests." ON )
option(JP2KFLAG "Whether or not to build using JPEG2000 support" OFF )
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 @@ -123,6 +125,8 @@ message("\tBUILD STATIC CORE: ${buildStaticCore}")
message("\tBUILD TESTS: ${buildTests}")
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 @@ -178,6 +182,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_STR}" )
# 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
Loading