Unverified Commit 6ce1dc44 authored by Zhang, Chen's avatar Zhang, Chen Committed by GitHub
Browse files

Merge pull request #304 from ornlneutronimaging/qa 

Merge pull request #302 from ornlneutronimaging/next
parents 5a6c484a 4f0f9852

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ repos: 
      - id: end-of-file-fixer

      - id: sort-simple-yaml

  - repo: https://github.com/psf/black

    rev: 24.2.0

    rev: 24.3.0

    hooks:

      - id: black

        args: ['--line-length=119']

.readthedocs.yaml

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ build: 
  os: ubuntu-20.04

  tools:

    python: "mambaforge-4.10"

  jobs:

    pre_build:

      - mkdir ~/tmp



sphinx:

  builder: html

conda.recipe/meta.yaml

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ requirements: 
    - dxchange

    - olefile

    - pooch

    - panel<1.3

    - param<2

    - panel

    - param

    - pyvista

    - holoviews

    - bokeh

environment.yml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ dependencies: 
  - datashader

  - hvplot

  # GUI

  - panel<1.3

  - param<2

  - panel

  - param

  - pyvista

  # IO

  - dxchange

src/imars3d/backend/dataio/data.py

+11 −5
Original line number Diff line number Diff line
@@ -59,14 +59,20 @@ class Foldernames(param.Foldername): 
    * any of the paths searched by resolve_dir_path() (if search_paths is None).

    """



    def _validate(self, val):



        if isinstance(val, (list, tuple)):

            for v in val:

                super()._validate(v)

        else:

            super()._validate(val)



    def _resolve(self, paths):

        if isinstance(paths, (str, Path)):

            return super()._resolve(paths)

        elif isinstance(paths, (list, tuple)):



        if isinstance(paths, (list, tuple)):

            return [self._resolve(path) for path in paths]

        else:

            name = next(x for x in [self.name, self.label, "Foldernames parameter"] if x)

            raise ValueError(f"{name} must be a string or a list of strings")

            return super()._resolve(paths)





class load_data(param.ParameterizedFunction):