Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Rebuild and rerender #5

Merged
merged 1 commit into from
Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cdt_name:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
16 changes: 0 additions & 16 deletions .ci_support/linux_64_python3.7.____cpython.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cdt_name:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cdt_name:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
34 changes: 0 additions & 34 deletions .ci_support/migrations/python310.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
16 changes: 0 additions & 16 deletions .ci_support/osx_64_python3.7.____cpython.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/win_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
16 changes: 0 additions & 16 deletions .ci_support/win_64_python3.7.____cpython.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions .ci_support/win_64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/win_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- jaimergp menuinst_dev
- napari bundle_tools_2
cxx_compiler:
- vs2017
- vs2019
pin_run_as_build:
python:
min_pin: x.x
Expand Down
5 changes: 3 additions & 2 deletions .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: automerge
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: automerge-action
id: automerge-action
uses: conda-forge/automerge-action@master
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
UPLOAD_PACKAGES: True
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
os: ubuntu
- CONFIG: linux_64_python3.7.____cpython
UPLOAD_PACKAGES: True
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
os: ubuntu
- CONFIG: linux_64_python3.8.____cpython
UPLOAD_PACKAGES: True
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
Expand All @@ -32,9 +28,6 @@ jobs:
- CONFIG: win_64_python3.10.____cpython
UPLOAD_PACKAGES: True
os: windows
- CONFIG: win_64_python3.7.____cpython
UPLOAD_PACKAGES: True
os: windows
- CONFIG: win_64_python3.8.____cpython
UPLOAD_PACKAGES: True
os: windows
Expand All @@ -44,9 +37,6 @@ jobs:
- CONFIG: osx_64_python3.10.____cpython
UPLOAD_PACKAGES: True
os: macos
- CONFIG: osx_64_python3.7.____cpython
UPLOAD_PACKAGES: True
os: macos
- CONFIG: osx_64_python3.8.____cpython
UPLOAD_PACKAGES: True
os: macos
Expand All @@ -64,7 +54,7 @@ jobs:
os: macos
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build on Linux
if: matrix.os == 'ubuntu'
Expand Down Expand Up @@ -120,11 +110,15 @@ jobs:
shell: cmd
run: |
call activate base
mamba.exe install -c conda-forge 'python=3.9' conda-build conda pip boa conda-forge-ci-setup=3
mamba.exe install -c conda-forge 'python=3.9' conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12"
if errorlevel 1 exit 1
setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml
if errorlevel 1 exit 1


if EXIST LICENSE.txt (
copy LICENSE.txt "recipe\\recipe-scripts-license.txt"
)
conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml
if errorlevel 1 exit 1
set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%"
Expand Down
13 changes: 10 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 22 additions & 8 deletions LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading