Skip to content
Snippets Groups Projects
Commit e47795c4 authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

Merge branch 'version' into 'main'

Resources

See merge request !15
parents d530314b 11fc399d
No related branches found
Tags 0.4.1
1 merge request!15Resources
Pipeline #520464 passed with warnings
from minvel.min_vel import *
from minvel.version import minvel_version
from minvel.version import *
......@@ -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()]
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment