Commit 650f6cb7 authored by Duggan, John's avatar Duggan, John
Browse files

Merge branch '7-use-vtk-pipelines-to-render-the-tiff-stacks' into 'main' 

Use VTK pipelines to render the TIFF stacks

Closes #7

See merge request ndip/trame-apps/ct-scan-visualizer!4
parents 156ea509 b267280f

.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.8'

_commit: '0.10'

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

project_name: ctscan-viz

publish_docs: false

publish_to_pypi: false

python_package: ctscan_viz

use_mantid: false

.gitlab-ci.yml

+9 −2
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
@@ -85,8 +93,7 @@ build-image: 
  when: manual

  script:

    - IMAGE_TAG=${VERSION}

    - docker pull ${IMAGE_NAME}:src-${CI_COMMIT_SHA}

    - docker build -f dockerfiles/Dockerfile -t image .

    - 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

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ repos: 
  hooks:

    - id: mypy

      name: mypy

      entry: poetry run mypy src

      entry: poetry run mypy .

      language: system

      types: [python]

      verbose: true

.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": "ctscan_viz",

        "args": ["--server"]

    }]

}

.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

}