| Message ID | 20161101122046.751-9-ricardo.wurmus@mdc-berlin.de |
|---|---|
| State | New |
| Headers | show |
Ricardo Wurmus writes: > * gnu/packages/python.scm (python-bleach, python2-bleach): New > variables. > --- > gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 590ba43..a2d3d3c 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -6693,6 +6693,32 @@ Jupyter Notebook format and Python APIs for working with notebooks.") > (define-public python2-nbformat > (package-with-python2 python-nbformat)) > > +(define-public python-bleach > + (package > + (name "python-bleach") > + (version "1.4.3") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "bleach" version)) > + (sha256 > + (base32 > + "0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj")))) > + (build-system python-build-system) > + (propagated-inputs > + `(("python-html5lib" ,python-html5lib-0.9) If you add the following snippet, it does not need this older version of html5lib to build. (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-html5lib-version (lambda* (#:key inputs #:allow-other-keys) (substitute* "setup.py" (("'html5lib>=0.999,<0.99999999',") "'html5lib',"))))))) I don't know whether this modification is problematic later on when running Jupyter (I'm not there yet). > + ("python-setuptools" ,python-setuptools) > + ("python-six" ,python-six))) > + (native-inputs > + `(("python-nose" ,python-nose))) > + (home-page "http://github.com/jsocol/bleach") > + (synopsis "Whitelist-based HTML-sanitizing tool") > + (description "Bleach is an easy whitelist-based HTML-sanitizing tool.") > + (license license:asl2.0))) > + > +(define-public python2-bleach > + (package-with-python2 python-bleach)) > + > (define-public python-chardet > (package > (name "python-chardet") Otherwise LGTM. Kind regards, Roel Janssen
Ricardo Wurmus writes: > * gnu/packages/python.scm (python-bleach, python2-bleach): New > variables. > --- > gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 590ba43..a2d3d3c 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -6693,6 +6693,32 @@ Jupyter Notebook format and Python APIs for working with notebooks.") > (define-public python2-nbformat > (package-with-python2 python-nbformat)) > > +(define-public python-bleach > + (package > + (name "python-bleach") > + (version "1.4.3") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "bleach" version)) > + (sha256 > + (base32 > + "0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj")))) > + (build-system python-build-system) > + (propagated-inputs > + `(("python-html5lib" ,python-html5lib-0.9) > + ("python-setuptools" ,python-setuptools) > + ("python-six" ,python-six))) > + (native-inputs > + `(("python-nose" ,python-nose))) > + (home-page "http://github.com/jsocol/bleach") > + (synopsis "Whitelist-based HTML-sanitizing tool") > + (description "Bleach is an easy whitelist-based HTML-sanitizing tool.") > + (license license:asl2.0))) > + > +(define-public python2-bleach > + (package-with-python2 python-bleach)) > + > (define-public python-chardet > (package > (name "python-chardet") Oh.. and the patch did not apply automatically for me. That could be a glitch on my side though. Kind regards, Roel Janssen
Roel Janssen <roel@gnu.org> writes: > Ricardo Wurmus writes: > >> * gnu/packages/python.scm (python-bleach, python2-bleach): New >> variables. >> --- >> gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ >> 1 file changed, 26 insertions(+) >> >> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm >> index 590ba43..a2d3d3c 100644 >> --- a/gnu/packages/python.scm >> +++ b/gnu/packages/python.scm >> @@ -6693,6 +6693,32 @@ Jupyter Notebook format and Python APIs for working with notebooks.") >> (define-public python2-nbformat >> (package-with-python2 python-nbformat)) >> >> +(define-public python-bleach >> + (package >> + (name "python-bleach") >> + (version "1.4.3") >> + (source >> + (origin >> + (method url-fetch) >> + (uri (pypi-uri "bleach" version)) >> + (sha256 >> + (base32 >> + "0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj")))) >> + (build-system python-build-system) >> + (propagated-inputs >> + `(("python-html5lib" ,python-html5lib-0.9) > > If you add the following snippet, it does not need this older version of > html5lib to build. > > (arguments > `(#:phases > (modify-phases %standard-phases > (add-after 'unpack 'fix-html5lib-version > (lambda* (#:key inputs #:allow-other-keys) > (substitute* "setup.py" > (("'html5lib>=0.999,<0.99999999',") "'html5lib',"))))))) > > I don't know whether this modification is problematic later on when > running Jupyter (I'm not there yet). I’d rather not do this, because they purposefully restricted the range. It used to be less restrictive, so I’m assuming that there’s a good reason for not using the latest version of html5lib. ~~ Ricardo
Ricardo Wurmus writes: > Roel Janssen <roel@gnu.org> writes: > >> Ricardo Wurmus writes: >> >>> * gnu/packages/python.scm (python-bleach, python2-bleach): New >>> variables. >>> --- >>> gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ >>> 1 file changed, 26 insertions(+) >>> >>> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm >>> index 590ba43..a2d3d3c 100644 >>> --- a/gnu/packages/python.scm >>> +++ b/gnu/packages/python.scm >>> @@ -6693,6 +6693,32 @@ Jupyter Notebook format and Python APIs for working with notebooks.") >>> (define-public python2-nbformat >>> (package-with-python2 python-nbformat)) >>> >>> +(define-public python-bleach >>> + (package >>> + (name "python-bleach") >>> + (version "1.4.3") >>> + (source >>> + (origin >>> + (method url-fetch) >>> + (uri (pypi-uri "bleach" version)) >>> + (sha256 >>> + (base32 >>> + "0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj")))) >>> + (build-system python-build-system) >>> + (propagated-inputs >>> + `(("python-html5lib" ,python-html5lib-0.9) >> >> If you add the following snippet, it does not need this older version of >> html5lib to build. >> >> (arguments >> `(#:phases >> (modify-phases %standard-phases >> (add-after 'unpack 'fix-html5lib-version >> (lambda* (#:key inputs #:allow-other-keys) >> (substitute* "setup.py" >> (("'html5lib>=0.999,<0.99999999',") "'html5lib',"))))))) >> >> I don't know whether this modification is problematic later on when >> running Jupyter (I'm not there yet). > > I’d rather not do this, because they purposefully restricted the range. > It used to be less restrictive, so I’m assuming that there’s a good > reason for not using the latest version of html5lib. Yes, I agree. Please ignore my suggestion. I submitted this before you explained they restricted the version requirement deliberately. Kind regards, Roel Janssen
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 590ba43..a2d3d3c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6693,6 +6693,32 @@ Jupyter Notebook format and Python APIs for working with notebooks.") (define-public python2-nbformat (package-with-python2 python-nbformat)) +(define-public python-bleach + (package + (name "python-bleach") + (version "1.4.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bleach" version)) + (sha256 + (base32 + "0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-html5lib" ,python-html5lib-0.9) + ("python-setuptools" ,python-setuptools) + ("python-six" ,python-six))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "http://github.com/jsocol/bleach") + (synopsis "Whitelist-based HTML-sanitizing tool") + (description "Bleach is an easy whitelist-based HTML-sanitizing tool.") + (license license:asl2.0))) + +(define-public python2-bleach + (package-with-python2 python-bleach)) + (define-public python-chardet (package (name "python-chardet")