Skip to content

Commit

Permalink
more conda-forge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
amystamile-usgs committed Feb 5, 2025
1 parent 333c944 commit ecd43c6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
14 changes: 7 additions & 7 deletions core_recipe/build.sh
Original file line number Diff line number Diff line change
@@ -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
19 changes: 11 additions & 8 deletions core_recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "8.3.0" %}
{% set version = "9.0.0" %}
{% set build_number = "0" %}

package:
Expand All @@ -8,32 +8,35 @@ 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]
number: {{ build_number }}

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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion isis/src/core/swig/python/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ecd43c6

Please sign in to comment.