diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 91e2a9b80..fdaf9af9f 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -31,7 +31,7 @@ jobs: run: shell: bash steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -111,7 +111,7 @@ jobs: run: echo "HEXRD_GIT_DESCRIBE=$(git describe --tag)" >> $GITHUB_ENV - name: Upload the package to github - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: HEXRD-${{ matrix.config.name }}-${{ env.HEXRD_GIT_DESCRIBE }}.tar.bz2 path: output/**/*.tar.bz2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89c7b6591..ea3cd94ca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,17 +33,17 @@ jobs: steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Checkout HEXRD - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: hexrd - name: Checkout examples - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: HEXRD/examples path: examples diff --git a/conda.recipe/conda_build_config.yaml b/conda.recipe/conda_build_config.yaml index 77f0eec0a..26d5d326b 100644 --- a/conda.recipe/conda_build_config.yaml +++ b/conda.recipe/conda_build_config.yaml @@ -2,3 +2,12 @@ python: - 3.9 - 3.10 - 3.11 +c_compiler: + - gcc # [linux] + - clang # [osx] + - vs2019 # [win] +target_platform: + - linux-64 # [linux] + - osx-64 # [osx] + - osx-arm64 # [osx] + - win-64 # [win] diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 229760264..ae2011a40 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -13,12 +13,20 @@ build: requirements: build: - # Numba is only here to ensure the numpy version is compatible - - numba - - numpy >=1.20 + # This is so that we can build cross-platform for osx-arm64 + - {{ compiler('c') }} + - python {{ python }} # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - numpy >=1.20 # [build_platform != target_platform] + # Numba is only here to make sure we use a version of numpy that is compatible + - numba # [build_platform != target_platform] + host: - python {{ python }} + - numpy >=1.20 - setuptools - setuptools_scm + # Numba is only here to make sure we use a version of numpy that is compatible + - numba run: - appdirs @@ -30,7 +38,7 @@ requirements: - h5py - lmfit - numba - - numpy >=1.20 + - {{ pin_compatible('numpy') }} - psutil - pycifrw - python @@ -44,7 +52,7 @@ requirements: - tbb - tqdm -test: +test: # [build_platform == target_platform] imports: - hexrd