Unverified Commit 707c7f6f authored by Zhang, Chen's avatar Zhang, Chen Committed by GitHub
Browse files

Merge pull request #293 from ornlneutronimaging/add_beamhardending_corr 

Add Beam hardening correction function to correction module
parents 7c9dea7a 750af058

.github/workflows/protected_branches.yml

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ jobs: 
      - name: Build Conda Package

        run: |

          # boa uses mamba to resolve dependencies

          conda install -y anaconda-client boa

          cd conda.recipe

          VERSION=$(versioningit ../) conda mambabuild --output-folder . -c conda-forge . || exit 1

          conda verify noarch/imars3d*.tar.bz2 || exit 1

.gitignore

+3 −0
Original line number Diff line number Diff line 
# direnv

.envrc



*.pyc

*~

.ipynb*

.pre-commit-config.yaml

+0 −8
Original line number Diff line number Diff line
@@ -29,14 +29,6 @@ repos: 
    hooks:

      - id: black

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

  - repo: https://github.com/PyCQA/flake8

    rev: 6.0.0

    hooks:

    - id: flake8

      exclude: |

        (?x)^(

                ^docs/conf.py

            )$

  - repo: https://github.com/adrienverge/yamllint.git

    rev: v1.31.0

    hooks:

conda.recipe/meta.yaml

+10 −7
Original line number Diff line number Diff line 
# load information from setup.cfg/setup.py

{% set data = load_setup_py_data() %}

{% set license = data.get('license') %}

{% set description = data.get('description') %}

{% set url = data.get('url') %}

{% set pyproject = load_file_data('pyproject.toml') %}

{% set project = pyproject.get('project', {}) %}

{% set license = project.get('license').get('text') %}

{% set description = project.get('description') %}

{% set project_url = pyproject.get('project', {}).get('urls') %}

{% set url = project_url.get('homepage') %}

# this will get the version set by environment variable

{% set version = environ.get('VERSION') %}

{% set version_number = environ.get('GIT_DESCRIBE_NUMBER', '0') | string %}

{% set version_number = version.split('+')[0] %}

{% set build_number = 0 %}



package:

  name: imars3d

  version: {{ version }}

  version: {{ version_number }}



source:

  path: ..



build:

  noarch: python

  number: {{ version_number }}

  number: {{ build_number }}

  string: py{{py}}

  script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv

environment.yml

+29 −14
Original line number Diff line number Diff line
@@ -2,29 +2,44 @@ name: imars3d 
channels:

  - conda-forge

dependencies:

  # -- Runtime

  # base

  - python

  - versioningit

  - toml

  # compute

  - astropy

  - tomopy

  - dxchange

  - jsonschema

  - panel>=0.14.2

  - param

  - pyvista

  - pydocstyle

  - algotom

  # plot

  - holoviews

  - bokeh

  - datashader

  - hvplot

  - build

  - toml

  - conda-build

  - conda-verify

  - pytest

  - pytest-cov

  # GUI

  - panel<1.3

  - param<2

  - pyvista

  # IO

  - dxchange

  - jsonschema

  # -- Development

  # utils

  - pre-commit

  # packaging

  - anaconda-client

  - boa

  - conda-build < 4

  - conda-verify

  - python-build

  # doc

  - pydocstyle

  - sphinx

  - sphinx_rtd_theme

  - versioningit

  - pip

  # test

  - pytest

  - pytest-cov

  # pip

  - pip:

    - check-wheel-contents

    - pytest-playwright