Commit 47827d54 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge remote-tracking branch 'origin/qa' into next

parents c1820917 d3fac3a7

.github/workflows/protected_branches.yml

+4 −6
Original line number Diff line number Diff line
@@ -62,12 +62,10 @@ jobs: 
      - name: Build Conda Package

        run: |

          # boa uses mamba to resolve dependencies

          echo "versioningit reports version=$(versioningit ../)"

          conda install -y boa

          conda mambabuild --output-folder . -c conda-forge .

      - name: Verify Conda Package

        run: |

          conda verify noarch/imars3d*.tar.bz2

          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

      - name: Deploy to Anaconda

        shell: bash -l {0}

        if: startsWith(github.ref, 'refs/tags/v')

conda.recipe/meta.yaml

+12 −6
Original line number Diff line number Diff line 
# this will reproduce the version from tags to match versioningit

{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0') %}

# 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') %}

# this will get the version set by environment variable

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

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



package:
@@ -11,19 +16,19 @@ source: 


build:

  noarch: python

  string: py{{py}}

  number: {{ version_number }}

  string: py{{py}}

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



requirements:

  host:

    - python

    - versioningit

    - pip



  build:

    - build

    - toml

    - versioningit



  run:

    - astropy
@@ -45,7 +50,8 @@ test: 
    - imars3d



about:

  home: https://github.com/ornlneutronimaging/iMars3D

  license: BSD (version 3)

  home: {{ url }}

  license: {{ license }}

  license_family: BSD

  license_file: ../LICENSE

  summary: {{ description }}

environment.yml

+1 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ dependencies: 
  - pre-commit

  - sphinx

  - sphinx_rtd_theme

  - versioningit

  - pip

  - pip:

    - versioningit

    - check-wheel-contents

    - pytest-playwright

    - bm3d-streak-removal

setup.py

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# this file is necessary so conda can read the contents of setup.cfg using

# its load_setup_py_data function

from setuptools import setup

from versioningit import get_cmdclasses



setup(cmdclass=get_cmdclasses())