Skip to content

Commit

Permalink
Add Marvin to the README
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Mar 2, 2021
2 parents 35c4509 + 6579216 commit 9b63e51
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 16 deletions.
6 changes: 0 additions & 6 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-comp7
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
zip_keys:
- - cdt_name
- docker_image
2 changes: 1 addition & 1 deletion .github/CODEOWNERS

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

22 changes: 19 additions & 3 deletions .scripts/build_steps.sh

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

30 changes: 30 additions & 0 deletions .scripts/logging_utils.sh

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

6 changes: 6 additions & 0 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.

5 changes: 3 additions & 2 deletions README.md

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

7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ source:

build:
noarch: python
number: 0
number: 1
script: {{ PYTHON }} -m pip install . --no-deps -vv

requirements:
host:
- pip
- python
- python >=3.6
- setuptools

run:
- python
- python >=3.6
- dask >=0.16.1
- numpy >=1.11.3
- scipy >=0.19.1
Expand Down Expand Up @@ -55,3 +55,4 @@ extra:
recipe-maintainers:
- GenevieveBuckley
- jakirkham
- m-albert

1 comment on commit 9b63e51

@conda-forge-linter
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

You should get push access to this feedstock and CI services.

Feel free to join the community chat room.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details here

Please sign in to comment.