Constrain `jinja2 <3` to `markupsafe <2` #238

xylar · 2022-03-17T07:52:33Z

markupsafe <2.1 is neeeded to avoid the issue in:
pallets/jinja#1585
We are constraining markupsafe <2 to be on the safe side.

Checklist

Used a personal fork of the feedstock to propose changes
Bumped the build number (if the version is unchanged)
Reset the build number to 0 (if the version changed)
Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
Ensured the license file is being packaged.

`markupsafe <2.1` is neeeded to avoid the issue in: pallets/jinja#1585 We are constraining `markupsafe <2` to be on the safe side.

conda-forge-linter · 2022-03-17T07:52:37Z

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

xylar · 2022-03-17T07:53:05Z

recipe/gen_patch_json.py

-                
+


pycharm automatically removes trailing whitespace. I can remove these edits if desired.

xylar · 2022-03-17T07:53:34Z

Here is the output of show_diff.py:

$ ./show_diff.py 
Downloading: https://conda.anaconda.org/conda-forge/noarch/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/noarch/repodata.json.bz2
noarch::jinja2-2.10.1-py_0.tar.bz2
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
noarch::jinja2-2.10.3-py_0.tar.bz2
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
noarch::jinja2-2.11.0-py_0.tar.bz2
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
noarch::jinja2-2.11.1-py_0.tar.bz2
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
noarch::jinja2-2.11.2-pyh9f0ad1d_0.tar.bz2
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
noarch::jinja2-2.11.3-pyh44b312d_0.tar.bz2
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
Downloading: https://conda.anaconda.org/conda-forge/linux-64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-64/repodata.json.bz2
linux-64::jinja2-2.9.6-py27_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp27mu"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp27mu"
+  ]
linux-64::jinja2-2.9.6-py35_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp35m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp35m"
+  ]
linux-64::jinja2-2.9.6-py36_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp36m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp36m"
+  ]
Downloading: https://conda.anaconda.org/conda-forge/linux-armv7l/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-armv7l/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-aarch64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-aarch64/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-ppc64le/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/linux-ppc64le/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/osx-64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/osx-64/repodata.json.bz2
2022-03-17 08:50:57,114 [3491848]   WARN - a.repo.GitUntrackedFilesHolder - Ignoring ignored file under another root: /home/xylar/code/conda-forge/conda-forge-repodata-patches-feedstock/patch_jinja2_markupsafe/recipe/__pycache__; root: /home/xylar/code/conda-forge/conda-forge-repodata-patches-feedstock/patch_jinja2_markupsafe; mapped root: null 
osx-64::jinja2-2.9.6-py27_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp27m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp27m"
+  ]
osx-64::jinja2-2.9.6-py35_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp35m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp35m"
+  ]
osx-64::jinja2-2.9.6-py36_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp36m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp36m"
+  ]
Downloading: https://conda.anaconda.org/conda-forge/osx-arm64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/osx-arm64/repodata.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/win-32/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/win-32/repodata.json.bz2
win-32::jinja2-2.9.6-py27_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp27m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp27m"
+  ]
win-32::jinja2-2.9.6-py35_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp35m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp35m"
+  ]
win-32::jinja2-2.9.6-py36_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp36m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp36m"
+  ]
Downloading: https://conda.anaconda.org/conda-forge/win-64/repodata_from_packages.json.bz2
Downloading: https://conda.anaconda.org/conda-forge/win-64/repodata.json.bz2
win-64::jinja2-2.9.6-py27_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp27m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp27m"
+  ]
win-64::jinja2-2.9.6-py35_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp35m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp35m"
+  ]
win-64::jinja2-2.9.6-py36_0.tar.bz2
-  "constrains": [
-    "python_abi * *_cp36m"
-  ],
-    "markupsafe >=0.23",
+    "markupsafe >=0.23,<2",
-  "version": "2.9.6"
+  "version": "2.9.6",
+  "constrains": [
+    "python_abi * *_cp36m"
+  ]

xylar · 2022-03-17T07:54:06Z

@conda-forge/jinja2 (and @jakirkham in particular), please let me know if this looks okay.

jakirkham · 2022-04-26T21:34:35Z

Thanks Xylar! 😄

Sorry for the delay here

These were missed in conda-forge#238

Constrain jinja2 <3 to markupsafe <2

022c253

`markupsafe <2.1` is neeeded to avoid the issue in: pallets/jinja#1585 We are constraining `markupsafe <2` to be on the safe side.

xylar requested a review from a team as a code owner March 17, 2022 07:52

xylar commented Mar 17, 2022

View reviewed changes

recipe/gen_patch_json.py

Copy link

Contributor Author

xylar Mar 17, 2022

Choose a reason for hiding this comment

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

pycharm automatically removes trailing whitespace. I can remove these edits if desired.

jakirkham merged commit 162c6f3 into conda-forge:main Apr 26, 2022

xylar deleted the patch_jinja2_markupsafe branch April 27, 2022 06:16

xylar mentioned this pull request Jun 4, 2022

markupsafe 2.1.0 build 0 breaks jinja2<3 conda-forge/markupsafe-feedstock#29

Closed

1 task

xylar added a commit to xylar/conda-forge-repodata-patches-feedstock that referenced this pull request Jun 4, 2022

Fix to constraining jinja2 <3 to markupsafe <2

097c293

These were missed in conda-forge#238

xylar mentioned this pull request Jun 4, 2022

Fix to constraining jinja2 <3 to markupsafe <2 #279

Merged

1 task

xylar added a commit to xylar/conda-forge-repodata-patches-feedstock that referenced this pull request Jun 4, 2022

Fix to constraining jinja2 <3 to markupsafe <2

bf98c54

These were missed in conda-forge#238

xylar mentioned this pull request Jun 22, 2022

[2.11.x] marginally loosen upper bound for markupsafe conda-forge/jinja2-feedstock#32

Merged

jakirkham mentioned this pull request Jul 7, 2022

Pin tornado to <6.2 conda-forge/distributed-feedstock#211

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Constrain `jinja2 <3` to `markupsafe <2` #238

Constrain `jinja2 <3` to `markupsafe <2` #238

xylar commented Mar 17, 2022 •

edited

Loading

conda-forge-linter commented Mar 17, 2022

xylar Mar 17, 2022

xylar commented Mar 17, 2022

xylar commented Mar 17, 2022

jakirkham commented Apr 26, 2022

Constrain jinja2 <3 to markupsafe <2 #238

Constrain jinja2 <3 to markupsafe <2 #238

Conversation

xylar commented Mar 17, 2022 • edited Loading

conda-forge-linter commented Mar 17, 2022

xylar Mar 17, 2022

Choose a reason for hiding this comment

xylar commented Mar 17, 2022

xylar commented Mar 17, 2022

jakirkham commented Apr 26, 2022

Constrain `jinja2 <3` to `markupsafe <2` #238

Constrain `jinja2 <3` to `markupsafe <2` #238

xylar commented Mar 17, 2022 •

edited

Loading