diff --git a/core_recipe/build.sh b/core_recipe/build.sh index 1af92c9004a7102fd27238560935aaa1547d804d..46595c7ddfe24096e04e7def9db74c859749641a 100644 --- a/core_recipe/build.sh +++ b/core_recipe/build.sh @@ -1,8 +1,8 @@ -#!/bin/bash -mkdir build -cd build +mkdir build_core install_core +cd build_core 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 + +cmake -GNinja -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DISIS_BUILD_SWIG=ON -DCMAKE_INSTALL_PREFIX=../install_core ../isis/src/core +ninja core && ninja install +cd swig/python/ +${PYTHON} setup.py install \ No newline at end of file diff --git a/core_recipe/meta.yaml b/core_recipe/meta.yaml index 05165c8af385fcbf677da0cdd859aba7d58d3d35..45627b014c59d50e080a6f1f6ec90bb7d394748c 100644 --- a/core_recipe/meta.yaml +++ b/core_recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "8.3.0" %} +{% set version = "9.0.0" %} {% set build_number = "0" %} package: @@ -8,6 +8,8 @@ package: 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] @@ -15,25 +17,26 @@ build: requirements: build: - - python + - {{ compiler("cxx") }} + - {{ stdlib("c") }} - cmake >=3.27,<3.28 - - cxx-compiler =1.1.2 - ninja + - python =3.11 + - setuptools host: - mesalib - nlohmann_json - - python + - python =3.11 - qt-main >=5.15.8, <5.16 + - setuptools - swig run: - - python + - python =3.11 - mesalib - {{ pin_compatible('qt-main', max_pin='x.x') }} - {{ pin_compatible('nlohmann_json', min_pin='x.x', max_pin='x.x') }} test: - imports: - - isisio commands: - test -e $PREFIX/lib/libcore${SHLIB_EXT} - test -e $PREFIX/include/isis/Pvl.h @@ -42,7 +45,7 @@ about: home: https://github.com/DOI-USGS/ISIS3 license: CC0-1.0 license_file: LICENSE.md - summary: "Integrated Software for Imagers and Spectrometers" + summary: "ISIS Core" extra: recipe-maintainers: diff --git a/isis/src/core/swig/python/setup.py.in b/isis/src/core/swig/python/setup.py.in index 250b08ee06a74bb358cfc2fac359575fa602e404..534cd9a51e92415c1090f9d17686348043bf6d2a 100644 --- a/isis/src/core/swig/python/setup.py.in +++ b/isis/src/core/swig/python/setup.py.in @@ -3,7 +3,7 @@ import setuptools if __name__ == '__main__': setuptools.setup( name='isiscore', - version='1.0.0', + version='9.0.0', packages=['isiscore'], package_data={'':['_isiscore.so']}, zip_safe=False, # Some OSes can not dynamically load an so from an egg (zipfile)