Unverified Commit 994db17a authored by Zhang, Chen's avatar Zhang, Chen Committed by GitHub
Browse files

Merge pull request #311 from ornlneutronimaging/qa 

Advance qa to main
parents 6ce1dc44 a9418113

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
/build

/dist

/python/imars3d.egg-info

conda.recipe/



# temp files and dirs

_tmp

.pre-commit-config.yaml

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


repos:

  - repo: https://github.com/pre-commit/pre-commit-hooks

    rev: v4.5.0

    rev: v4.6.0

    hooks:

      - id: trailing-whitespace

      - id: check-docstring-first
@@ -25,7 +25,7 @@ repos: 
      - id: end-of-file-fixer

      - id: sort-simple-yaml

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

    rev: 24.3.0

    rev: 24.8.0

    hooks:

      - id: black

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

.readthedocs.yaml

+2 −2
Original line number Diff line number Diff line 
version: 2



build:

  os: ubuntu-20.04

  os: "ubuntu-22.04"

  tools:

    python: "mambaforge-4.10"

    python: "mambaforge-22.9"

  jobs:

    pre_build:

      - mkdir ~/tmp

conda.recipe/meta.yaml

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ requirements: 
    - bokeh

    - datashader

    - hvplot

    - numpy<2



test:

  imports:

environment.yml

+2 −0
Original line number Diff line number Diff line
@@ -11,11 +11,13 @@ dependencies: 
  - astropy

  - tomopy

  - algotom

  - numpy < 2

  # plot

  - holoviews

  - bokeh

  - datashader

  - hvplot

  - dask

  # GUI

  - panel

  - param