Merge branch 'update' into 'master'

uUpdate to ncm-database

See merge request !3

.gitlab-ci.yml

 stages:
   - test
   - publish
-  - trigger
 
 ####
 # Template: GitLab runner tags
@@ -17,8 +16,8 @@ stages:
   image: python:3.7.7
   extends: .dev-tags
   before_script:
-    - pip3 install poetry
-    - poetry config http-basic.database __token__ ${GITLAB_API_TOKEN}
+    - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
+    - . $HOME/.profile
     - poetry install
 
 ####
@@ -66,21 +65,3 @@ PyPi:
     - poetry build
     - poetry config http-basic.GeoPhys __token__ ${GITLAB_API_TOKEN}
     - poetry publish -r GeoPhys
-
-####
-# Stage: trigger
-####
-
-Trigger NCMws:
-  stage: trigger
-  image: node:latest
-  tags:
-    - development
-  only:
-    - master@ghsc/nshmp/ncm/GeoPhys
-  script:
-    - |
-      curl -X POST \
-        -F token=${NCM_TRIGGER_TOKEN} \
-        -F "ref=master" \
-        https://code.usgs.gov/api/v4/projects/3338/trigger/pipeline

geophys/geo_phys.py

@@ -6,7 +6,7 @@ import geofram as gf
 import minvel as mv
 import numpy as np
 import thermod as tm
-from database import database_directory
+from ncm_database import database_directory
 from netCDF4 import Dataset
 from scipy import interpolate as interp
 from scipy import special as sp

poetry.toml

 [repositories]
-[repositories.database]
+[repositories.ncm-database]
 url = "https://code.usgs.gov/api/v4/projects/2294/packages/pypi"
 
 [repositories.GeoFram]

pyproject.toml

@@ -14,10 +14,10 @@ python = "^3.6"
 netCDF4 = "^1.5.4"
 numpy = "^1.19.1"
 scipy = "^1.5.2"
-database = "^0.1.0"
-minvel = "^0.1.0"
-geofram = "^0.1.0"
-thermod = "^0.1.0"
+ncm-database = "^0.2.0"
+thermod = "^0.1.1"
+geofram = "^0.1.1"
+minvel = "^0.1.1"
 
 [tool.poetry.dev-dependencies]
 pylint = "^2.5.3"
@@ -27,6 +27,7 @@ isort = "4.3"
 
 [tool.poetry.scripts]
 setup = "scripts:setup"
+database = "scripts:database"
 geophys = "scripts:geophys"
 example = "scripts:example"
 help = "scripts:help"
@@ -58,7 +59,7 @@ use_parentheses = true
 not_skip = "__init__.py"
 
 [[tool.poetry.source]]
-name = "database"
+name = "ncm-database"
 url = "https://code.usgs.gov/api/v4/projects/2294/packages/pypi/simple"
 secondary = true
 

scripts.py

@@ -12,8 +12,12 @@ def setup():
     # Install database and dependencies
     os.system("git config core.hookspath .githooks")
     check_call(["poetry", "install"])
+    database()
+
+
+def database():
     print("\nDownloading GeoPhys database\n")
-    check_call(["python", "-m", "database", "--GeoPhys", "--clean"])
+    check_call(["python", "-m", "ncm_database", "--GeoPhys", "--clean"])
 
 
 def geophys():