Commit b3490050 authored by Kiesling, Kalin Rose's avatar Kiesling, Kalin Rose
Browse files

Merge branch 'ci-update' into 'main' 

CI Update

See merge request neams-workbench/PyGriffin!1
parents f5b7cd78 26a0d3c7

.gitlab-ci.yml

+7 −2
Original line number Diff line number Diff line 
default:

  tags:

    - pygriffin-docker

    - pygriffin



variables:

  CI_DIR: $CI_BUILDS_DIR/$CI_PIPELINE_ID

  GIT_CLONE_PATH: $CI_DIR/$CI_PROJECT_NAME



stages:

  - build_and_test
@@ -8,5 +12,6 @@ stages: 
build_and_test:

  stage: build_and_test

  script:

    - pip install .[test]

    - conda activate pygriffin-ci

    - python -m pip install .[test]

    - pytest -v ./tests

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ kwargs = { 
    'author_email': 'pygriffin@anl.gov',

    'download_url': 'https://git-out.gss.anl.gov/nstauff/pygriffin',

    'python_requires': '>=3.6',

    'install_requires': ['numpy'],

    'install_requires': ['numpy', 'pandas'],

    'extras_require': {

        'test': ['pytest']

    }