Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ISIS3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aflab
astrogeology
ISIS3
Commits
ecd43c6b
Commit
ecd43c6b
authored
5 months ago
by
amystamile-usgs
Browse files
Options
Downloads
Patches
Plain Diff
more conda-forge updates
parent
333c9442
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
core_recipe/build.sh
+7
-7
7 additions, 7 deletions
core_recipe/build.sh
core_recipe/meta.yaml
+11
-8
11 additions, 8 deletions
core_recipe/meta.yaml
isis/src/core/swig/python/setup.py.in
+1
-1
1 addition, 1 deletion
isis/src/core/swig/python/setup.py.in
with
19 additions
and
16 deletions
core_recipe/build.sh
+
7
−
7
View file @
ecd43c6b
#!/bin/bash
mkdir
build_core install_core
mkdir
build
cd
build_core
cd
build
export
ISISROOT
=
$PWD
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
cmake
-GNinja
-DBUILD_TESTS
=
OFF
-DCMAKE_BUILD_TYPE
=
Release
-DISIS_BUILD_SWIG
=
ON
-DCMAKE_INSTALL_PREFIX
=
../install_core ../isis/src/core
cd
${
SRC_DIR
}
/build/swig/python
ninja core
&&
ninja
install
python setup.py
install
cd
swig/python/
${
PYTHON
}
setup.py
install
\ No newline at end of file
This diff is collapsed.
Click to expand it.
core_recipe/meta.yaml
+
11
−
8
View file @
ecd43c6b
{
%
set version = "
8.3
.0" %
}
{
%
set version = "
9.0
.0" %
}
{
%
set build_number = "0" %
}
{
%
set build_number = "0" %
}
package
:
package
:
...
@@ -8,6 +8,8 @@ package:
...
@@ -8,6 +8,8 @@ package:
source
:
source
:
url
:
https://github.com/DOI-USGS/ISIS3/archive/{{ version }}.tar.gz
url
:
https://github.com/DOI-USGS/ISIS3/archive/{{ version }}.tar.gz
sha256
:
394ba889ceef5aaebc25e0e28f084209defb2c724e291ab86a587181bf095c7a
sha256
:
394ba889ceef5aaebc25e0e28f084209defb2c724e291ab86a587181bf095c7a
# git_url: https://github.com/DOI-USGS/ISIS3.git
# git_branch: new_pvl_core
build
:
build
:
skip
:
true
# [win]
skip
:
true
# [win]
...
@@ -15,25 +17,26 @@ build:
...
@@ -15,25 +17,26 @@ build:
requirements
:
requirements
:
build
:
build
:
-
python
-
{{
compiler("cxx")
}}
-
{{
stdlib("c")
}}
-
cmake >=3.27,<3.28
-
cmake >=3.27,<3.28
-
cxx-compiler =1.1.2
-
ninja
-
ninja
-
python =3.11
-
setuptools
host
:
host
:
-
mesalib
-
mesalib
-
nlohmann_json
-
nlohmann_json
-
python
-
python
=3.11
-
qt-main >=5.15.8, <5.16
-
qt-main >=5.15.8, <5.16
-
setuptools
-
swig
-
swig
run
:
run
:
-
python
-
python
=3.11
-
mesalib
-
mesalib
-
{{
pin_compatible('qt-main'
,
max_pin='x.x')
}}
-
{{
pin_compatible('qt-main'
,
max_pin='x.x')
}}
-
{{
pin_compatible('nlohmann_json'
,
min_pin='x.x'
,
max_pin='x.x')
}}
-
{{
pin_compatible('nlohmann_json'
,
min_pin='x.x'
,
max_pin='x.x')
}}
test
:
test
:
imports
:
-
isisio
commands
:
commands
:
-
test -e $PREFIX/lib/libcore${SHLIB_EXT}
-
test -e $PREFIX/lib/libcore${SHLIB_EXT}
-
test -e $PREFIX/include/isis/Pvl.h
-
test -e $PREFIX/include/isis/Pvl.h
...
@@ -42,7 +45,7 @@ about:
...
@@ -42,7 +45,7 @@ about:
home
:
https://github.com/DOI-USGS/ISIS3
home
:
https://github.com/DOI-USGS/ISIS3
license
:
CC0-1.0
license
:
CC0-1.0
license_file
:
LICENSE.md
license_file
:
LICENSE.md
summary
:
"
I
ntegrated
Software
for
Imagers
and
Spectrometers
"
summary
:
"
I
SIS
Core
"
extra
:
extra
:
recipe-maintainers
:
recipe-maintainers
:
...
...
This diff is collapsed.
Click to expand it.
isis/src/core/swig/python/setup.py.in
+
1
−
1
View file @
ecd43c6b
...
@@ -3,7 +3,7 @@ import setuptools
...
@@ -3,7 +3,7 @@ import setuptools
if __name__ == '__main__':
if __name__ == '__main__':
setuptools.setup(
setuptools.setup(
name='isiscore',
name='isiscore',
version='
1
.0.0',
version='
9
.0.0',
packages=['isiscore'],
packages=['isiscore'],
package_data={'':['_isiscore.so']},
package_data={'':['_isiscore.so']},
zip_safe=False, # Some OSes can not dynamically load an so from an egg (zipfile)
zip_safe=False, # Some OSes can not dynamically load an so from an egg (zipfile)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment