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

Merge branch 'pipelines' into 'main'

update images

See merge request !11
parents 8cf8d2f1 7c47b4c3
No related branches found
No related tags found
1 merge request!11update images
Pipeline #295993 passed with warnings
...@@ -2,6 +2,8 @@ variables: ...@@ -2,6 +2,8 @@ variables:
POETRY_CACHE_DIR: ${CI_PROJECT_DIR}/.poetry POETRY_CACHE_DIR: ${CI_PROJECT_DIR}/.poetry
PYTHONUNBUFFERED: 1 PYTHONUNBUFFERED: 1
image: ${CI_REGISTRY}/devops/images/usgs/python:3.8
# Do not run for merge requests # Do not run for merge requests
workflow: workflow:
rules: rules:
...@@ -26,7 +28,6 @@ Init: ...@@ -26,7 +28,6 @@ Init:
artifacts: artifacts:
paths: paths:
- ${POETRY_CACHE_DIR} - ${POETRY_CACHE_DIR}
image: ${DEVOPS_REGISTRY}usgs/python:3.8
script: script:
- poetry install - poetry install
stage: init stage: init
...@@ -38,7 +39,6 @@ Init: ...@@ -38,7 +39,6 @@ Init:
Lint: Lint:
# TODO fix code # TODO fix code
allow_failure: true allow_failure: true
image: ${DEVOPS_REGISTRY}usgs/python:3.8
needs: needs:
- Init - Init
stage: test stage: test
...@@ -46,7 +46,6 @@ Lint: ...@@ -46,7 +46,6 @@ Lint:
- poetry run lint - poetry run lint
Format Check: Format Check:
image: ${DEVOPS_REGISTRY}usgs/python:3.8
needs: needs:
- Init - Init
stage: test stage: test
...@@ -54,7 +53,6 @@ Format Check: ...@@ -54,7 +53,6 @@ Format Check:
- poetry run format_check - poetry run format_check
Database: Database:
image: ${DEVOPS_REGISTRY}usgs/python:3.8
needs: needs:
- Init - Init
stage: test stage: test
...@@ -62,7 +60,6 @@ Database: ...@@ -62,7 +60,6 @@ Database:
- poetry run database --GeoPhys - poetry run database --GeoPhys
Example: Example:
image: ${DEVOPS_REGISTRY}usgs/python:3.8
needs: needs:
- Init - Init
stage: test stage: test
...@@ -75,7 +72,6 @@ Example: ...@@ -75,7 +72,6 @@ Example:
#### ####
PyPi: PyPi:
image: ${DEVOPS_REGISTRY}usgs/python:3.8
needs: needs:
- Format Check - Format Check
- Init - Init
......
[tool.poetry] [tool.poetry]
name = "geophys" name = "geophys"
version = "0.1.0" version = "0.1.0"
description = ''' description = "Extract geophysical information from the NCM (Boyd, 2020)"
Extract geophysical information from the NCM (Boyd, 2020) including,
for example, S-wave, P-wave, and density profiles, as well as attributes
for ground motions models including VS30, Z1.0, and Z2.5
'''
authors = ["Oliver Boyd <olboyd@usgs.gov>"] authors = ["Oliver Boyd <olboyd@usgs.gov>"]
maintainers = ["Brandon Clayton <bclayton@usgs.gov>"] maintainers = ["Brandon Clayton <bclayton@usgs.gov>"]
......
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