amaranth
amaranth copied to clipboard
Fixes #713 by requiring MarkupSafe anterior to 2.1.0
I don't think this is an appropriate fix? The amaranth
package shouldn't be introducing dependencies to fix issues with its dependent amaranth-boards
package. I'll take a closer look at this later if you can't improve on this PR.
well, the jinja2 team clearly expressed that they won't do that, and that users ought to pin MarkupSafe themselves (see the links to comments in the issue)
Another solution if migrating to latest jinja2 is not possible, would be to fork the target jinja2 release, and fix the code to use the new name of safe_unicode. I may consider doing that too.
Anyway this morning I was just trying using github editor. There are two choices, either keep the current jinja version (this PR) and migrate to latest (PR #715), to see what is more painful.
Codecov Report
Merging #714 (3632bed) into main (9a5a614) will decrease coverage by
0.23%
. The diff coverage is19.51%
.
@@ Coverage Diff @@
## main #714 +/- ##
==========================================
- Coverage 81.22% 80.99% -0.24%
==========================================
Files 49 49
Lines 6467 6483 +16
Branches 1526 1747 +221
==========================================
- Hits 5253 5251 -2
- Misses 1021 1038 +17
- Partials 193 194 +1
Impacted Files | Coverage Δ | |
---|---|---|
amaranth/_toolchain/cxx.py | 95.12% <ø> (ø) |
|
amaranth/build/plat.py | 25.97% <0.00%> (-1.47%) |
:arrow_down: |
amaranth/tracer.py | 90.24% <80.00%> (+1.05%) |
:arrow_up: |
amaranth/_toolchain/yosys.py | 59.13% <100.00%> (-1.89%) |
:arrow_down: |
amaranth/__init__.py | 66.66% <0.00%> (-22.23%) |
:arrow_down: |
amaranth/build/run.py | 21.73% <0.00%> (ø) |
:mega: We’re building smart automated test selection to slash your CI/CD build times. Learn more
See https://github.com/amaranth-lang/amaranth/issues/713#issuecomment-1256881764.