Skip to content
This repository has been archived by the owner on Mar 16, 2022. It is now read-only.

Placeholder for the next version #13

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
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
13 changes: 9 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml

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

6 changes: 2 additions & 4 deletions .ci_support/linux_64_python3.7.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cdt_name:
- cos6
channel_sources:
- nsls2forge,defaults
- conda-forge,nsls2forge
channel_targets:
- nsls2forge main
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -23,7 +23,5 @@ python:
target_platform:
- linux-64
zip_keys:
- - cdt_name
- docker_image
- - python
- numpy
6 changes: 2 additions & 4 deletions .ci_support/linux_64_python3.8.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cdt_name:
- cos6
channel_sources:
- nsls2forge,defaults
- conda-forge,nsls2forge
channel_targets:
- nsls2forge main
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -23,7 +23,5 @@ python:
target_platform:
- linux-64
zip_keys:
- - cdt_name
- docker_image
- - python
- numpy
6 changes: 2 additions & 4 deletions .ci_support/linux_64_python3.9.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cdt_name:
- cos6
channel_sources:
- nsls2forge,defaults
- conda-forge,nsls2forge
channel_targets:
- nsls2forge main
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -23,7 +23,5 @@ python:
target_platform:
- linux-64
zip_keys:
- - cdt_name
- docker_image
- - python
- numpy
1 change: 1 addition & 0 deletions .gitattributes

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

1 change: 1 addition & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ jobs:
uses: conda-forge/automerge-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/webservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ jobs:
uses: conda-forge/webservices-dispatch-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
33 changes: 20 additions & 13 deletions .scripts/build_steps.sh

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

9 changes: 7 additions & 2 deletions .scripts/logging_utils.sh

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

26 changes: 17 additions & 9 deletions .scripts/run_docker_build.sh

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

2 changes: 1 addition & 1 deletion LICENSE.txt

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

1 change: 1 addition & 0 deletions README.md

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

32 changes: 29 additions & 3 deletions build-locally.py

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

4 changes: 3 additions & 1 deletion recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channel_sources:
- nsls2forge,defaults
- conda-forge,nsls2forge
channel_targets:
- nsls2forge main
cdt_name:
Expand All @@ -11,6 +11,8 @@ cxx_compiler_version: # [linux]
fortran_compiler_version: # [unix]
- 7.3 # [linux]
- 4 # [osx and x86_64]
# docker_image:
# - quay.io/condaforge/linux-anvil-comp7
numpy:
- 1.16
- 1.16
Expand Down
Loading