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
c8a18116
Unverified
Commit
c8a18116
authored
2 years ago
by
Austin Sanders
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Release prep (#5154)
* Release prep * Pinned gsl to <2.7
parent
aa28f795
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
environment.yml
+1
-1
1 addition, 1 deletion
environment.yml
isis/CMakeLists.txt
+1
-1
1 addition, 1 deletion
isis/CMakeLists.txt
recipe/meta.yaml
+5
-9
5 additions, 9 deletions
recipe/meta.yaml
with
7 additions
and
11 deletions
environment.yml
+
1
−
1
View file @
c8a18116
...
...
@@ -24,7 +24,7 @@ dependencies:
-
geotiff
-
gmp
-
graphviz
-
gsl>=2.6
-
gsl>=2.6
,<2.7
-
hdf5
-
icu
-
inja
...
...
This diff is collapsed.
Click to expand it.
isis/CMakeLists.txt
+
1
−
1
View file @
c8a18116
...
...
@@ -46,7 +46,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${VERSION}")
# Other release information
string
(
TIMESTAMP VERSION_DATE
"%Y-%m-%d"
UTC
)
set
(
RELEASE_STAGE
"
beta
"
)
# (alpha, beta, stable)
set
(
RELEASE_STAGE
"
stable
"
)
# (alpha, beta, stable)
# Define to the address where bug reports for this package should be sent.
set
(
PACKAGE_BUGREPORT
"https://github.com/USGS-Astrogeology/ISIS3/issues"
)
...
...
This diff is collapsed.
Click to expand it.
recipe/meta.yaml
+
5
−
9
View file @
c8a18116
...
...
@@ -18,12 +18,12 @@
# 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 = "7.2.0
_RC1
" %
}
{
%
set version = "7.2.0" %
}
# 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 = "
1
" %
}
{
%
set build_number = "
0
" %
}
package
:
name
:
isis
...
...
@@ -46,7 +46,6 @@ build:
requirements
:
build
:
-
ale=0.8.6
-
aom
-
armadillo
-
boost=1.72
-
boost-cpp=1.72
...
...
@@ -58,10 +57,9 @@ requirements:
-
cspice
-
csm>=3.0.3,<3.0.4
-
curl
-
cxx-compiler=1.1.2
-
doxygen
-
eigen<3.4
# versioned due to major release of embree 3 on conda-forge
# it is not compatible without changes to ISIS
-
embree>=2.17,<3
-
ffmpeg
-
geos>=3.7,<3.8
...
...
@@ -89,12 +87,12 @@ requirements:
-
nlohmann_json
-
ninja==1.7.2
-
nn
-
numpy=1.23
-
opencv>=4.5.2
-
openssl>=1.1.1k
-
pcl>=1.10.0
-
protobuf<3.20
-
python>=3.7.11
-
pytest
-
rclone
-
qhull
-
qt>=5.9.6,<5.15.0
...
...
@@ -106,7 +104,6 @@ requirements:
-
texlive-core
-
tnt
-
x264
-
x265
-
xalan-c
-
xerces-c=3
-
xorg-kbproto
...
...
@@ -119,7 +116,6 @@ requirements:
run
:
-
{{
pin_compatible('ale'
,
max_pin='x.x.x')
}}
-
{{
pin_compatible('armadillo'
,
max_pin='x.x.x')
}}
-
{{
pin_compatible('aom'
,
max_pin='x.x')
}}
-
{{
pin_compatible('boost'
,
max_pin='x.x')
}}
-
{{
pin_compatible('boost-cpp'
,
max_pin='x.x')
}}
-
blas
...
...
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