Skip to content

Commit

Permalink
Merge pull request #27 from xylar/constrain_markupsafe
Browse files Browse the repository at this point in the history
Constrain markupsafe<2
  • Loading branch information
xylar authored Mar 17, 2022
2 parents 0b318ea + cddaffa commit e8e684b
Show file tree
Hide file tree
Showing 11 changed files with 142 additions and 32 deletions.
9 changes: 7 additions & 2 deletions .azure-pipelines/azure-pipelines-linux.yml

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

7 changes: 6 additions & 1 deletion .ci_support/README

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

9 changes: 3 additions & 6 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
zip_keys:
- - cdt_name
- docker_image
- 3.9.* *_cpython
2 changes: 2 additions & 0 deletions .gitattributes

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

35 changes: 31 additions & 4 deletions .scripts/build_steps.sh

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

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

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

28 changes: 21 additions & 7 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.

10 changes: 6 additions & 4 deletions README.md

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

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

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

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

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

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

run:
- python
- python >=3.5
- setuptools
- markupsafe >=0.23
- markupsafe >=0.23,<2

test:
imports:
Expand Down

0 comments on commit e8e684b

Please sign in to comment.