diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/patches/python-tinycss2-flake8-compat.patch | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
| download | guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/patches/python-tinycss2-flake8-compat.patch')
| -rw-r--r-- | gnu/packages/patches/python-tinycss2-flake8-compat.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnu/packages/patches/python-tinycss2-flake8-compat.patch b/gnu/packages/patches/python-tinycss2-flake8-compat.patch deleted file mode 100644 index a66eb42fa1..0000000000 --- a/gnu/packages/patches/python-tinycss2-flake8-compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix test failure that occurs with recent versions of Flake8. - -Taken from upstream: -https://github.com/Kozea/tinycss2/commit/6556604fb98c2153412384d6f0f705db2da1aa60 - -diff --git a/tinycss2/css-parsing-tests/make_color3_hsl.py b/tinycss2/css-parsing-tests/make_color3_hsl.py -index d1fd3a6..56fda0c 100644 ---- a/tinycss2/css-parsing-tests/make_color3_hsl.py -+++ b/tinycss2/css-parsing-tests/make_color3_hsl.py -@@ -8,16 +8,17 @@ def trim(s): - print('[') - print(',\n'.join( - '"hsl%s(%s, %s%%, %s%%%s)", [%s, %s, %s, %s]' % ( -- ('a' if a is not None else '', h, -- trim(str(s / 10.)), trim(str(l / 10.)), -- ', %s' % a if a is not None else '') + -+ ('a' if alpha is not None else '', hue, -+ trim(str(saturation / 10.)), trim(str(light / 10.)), -+ ', %s' % alpha if alpha is not None else '') + - tuple(trim(str(round(v, 10))) -- for v in colorsys.hls_to_rgb(h / 360., l / 1000., s / 1000.)) + -- (a if a is not None else 1,) -+ for v in colorsys.hls_to_rgb( -+ hue / 360., light / 1000., saturation / 1000.)) + -+ (alpha if alpha is not None else 1,) - ) -- for a in [None, 1, .2, 0] -- for l in range(0, 1001, 125) -- for s in range(0, 1001, 125) -- for h in range(0, 360, 30) -+ for alpha in [None, 1, .2, 0] -+ for light in range(0, 1001, 125) -+ for saturation in range(0, 1001, 125) -+ for hue in range(0, 360, 30) - )) - print(']') |