Commit dea826c1 authored by Watson, Gregory's avatar Watson, Gregory
Browse files

Merge changes and update README

parent bd2483fa

.copier-answers.yml

+2 −1
Original line number Diff line number Diff line 
# Please do not edit or delete this file. It is needed to be able to update project from template.

_commit: 0.2.2

_commit: '0.10'

_src_path: https://code.ornl.gov/ndip/project-templates/python.git

project_name: MVVM Library for Python

publish_docs: true

publish_to_pypi: true

python_package: nova-mvvm

use_mantid: false

.dockerignore

+4 −0
Original line number Diff line number Diff line 
<<<<<<< before updating

dockerfiles

=======

dockerfiles/Dockerfile

>>>>>>> after updating

.gitlab-ci.yml

+36 −1
Original line number Diff line number Diff line 
workflow:

  rules:

    - if: $CI_COMMIT_TAG

      when: never

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'

      when: never

    - when: always



stages:

  - lint

  - test
@@ -72,11 +80,38 @@ tag-release: 
      if [ -z $(git ls-remote --tags origin "$VERSION") ]; then

        git remote add gitlab https://oauth2:${NDIP_GROUP_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git

        git tag ${VERSION}

        git push gitlab ${VERSION} --tags

        git push gitlab --tags

      fi

  tags:

  - rse-multi-builder



<<<<<<< before updating

=======



build-image:

  stage: publish

  variables:

    OVERWRITE_IMAGE: "false"

  when: manual

  script:

    - IMAGE_TAG=${VERSION}

    - docker build -f dockerfiles/Dockerfile -t image --target run --build-arg SOURCE_IMAGE=${IMAGE_NAME}:src-${CI_COMMIT_SHA} .

    - docker tag image ${IMAGE_NAME}:bin-${CI_COMMIT_SHA}

    - docker push ${IMAGE_NAME}:bin-${CI_COMMIT_SHA}

    - docker tag image ${IMAGE_NAME}:latest

    - docker push ${IMAGE_NAME}:latest

    - >

      if ! docker pull ${IMAGE_NAME}:${IMAGE_TAG} || [ "$OVERWRITE_IMAGE" == "true" ]; then

        docker tag image ${IMAGE_NAME}:${IMAGE_TAG}

        docker push ${IMAGE_NAME}:${IMAGE_TAG}

      else

        echo tag ${IMAGE_TAG} already exists in ${NDIP_DOCKER_REPOSITORY}. Use OVERWRITE_IMAGE="true", delete image in the repository or change the tag

        exit 1

      fi

  tags:

    - rse-multi-builder



>>>>>>> after updating

package-build:

  stage: publish

  script:

.vscode/launch.json

0 → 100644
+10 −0
Original line number Diff line number Diff line 
{

    "configurations": [{

        "name": "Launch",

        "type": "debugpy",

        "request": "launch",

        "cwd": "${workspaceFolder}",

        "module": "nova_mvvm",

        "args": []

    }]

}

.vscode/settings.json

+6 −1
Original line number Diff line number Diff line 
{

    "[python]": {

        "editor.defaultFormatter": "charliermarsh.ruff"

    }

    },

    "python.testing.pytestArgs": [

        "tests"

    ],

    "python.testing.unittestEnabled": false,

    "python.testing.pytestEnabled": true

}