Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MinVel
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
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
National Crustal Model
MinVel
Commits
e47795c4
Commit
e47795c4
authored
4 months ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Plain Diff
Merge branch 'version' into 'main'
Resources See merge request
!15
parents
d530314b
11fc399d
No related branches found
Branches containing commit
Tags
0.4.1
Tags containing commit
1 merge request
!15
Resources
Pipeline
#520464
passed with warnings
4 months ago
Stage: init
Stage: test
Stage: publish
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
minvel/__init__.py
+1
-1
1 addition, 1 deletion
minvel/__init__.py
minvel/version.py
+10
-1
10 additions, 1 deletion
minvel/version.py
pyproject.toml
+1
-0
1 addition, 0 deletions
pyproject.toml
with
12 additions
and
2 deletions
minvel/__init__.py
+
1
−
1
View file @
e47795c4
from
minvel.min_vel
import
*
from
minvel.version
import
minvel_version
from
minvel.version
import
*
This diff is collapsed.
Click to expand it.
minvel/version.py
+
10
−
1
View file @
e47795c4
...
...
@@ -6,8 +6,17 @@ Description: Returns the app version info
import
json
from
os
import
path
from
typing
import
Dict
,
List
from
ncm_database
import
ncm_database_version
def
minvel_version
():
def
minvel_version
()
->
Dict
:
"""
Returns the app version
"""
with
open
(
f
"
{
path
.
dirname
(
__file__
)
}
/resources/app-version.json
"
)
as
file
:
return
json
.
loads
(
file
.
read
())
def
minvel_versions
()
->
List
[
Dict
]:
"""
Returns the app version and ncm-database version
"""
return
[
minvel_version
(),
ncm_database_version
()]
This diff is collapsed.
Click to expand it.
pyproject.toml
+
1
−
0
View file @
e47795c4
...
...
@@ -4,6 +4,7 @@ version = "0.1.0"
description
=
"Calculate anharmonic p- and s-wave velocity and density for zero-porosity mineral aggregates"
authors
=
[
"Oliver Boyd <olboyd@usgs.gov>"
]
maintainers
=
[
"Brandon Clayton <bclayton@usgs.gov>"
]
include
=
[
"minvel/resources/*"
]
[tool.poetry.dependencies]
python
=
">
=
3.8
.
1
,
<
3.12
"
...
...
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