Skip to content

Commit

Permalink
Merge pull request #32 from h-vetinari/2.11.x
Browse files Browse the repository at this point in the history
[2.11.x] marginally loosen upper bound for markupsafe
  • Loading branch information
xylar authored Jun 22, 2022
2 parents e8e684b + 2b0c329 commit 50f60e0
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 15 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,9 +6,3 @@ channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_cpython
3 changes: 2 additions & 1 deletion .circleci/config.yml

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 }}
39 changes: 33 additions & 6 deletions README.md

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

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

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

requirements:
Expand All @@ -25,7 +25,7 @@ requirements:
run:
- python >=3.5
- setuptools
- markupsafe >=0.23,<2
- markupsafe >=0.23,<2.1

test:
imports:
Expand Down

0 comments on commit 50f60e0

Please sign in to comment.