diff mbox series

[04/08] package/python-daphne: new package

Message ID 20190804011631.86261-5-aduskett@gmail.com
State Accepted
Headers show
Series Support for Django channels | expand

Commit Message

Adam Duskett Aug. 4, 2019, 1:16 a.m. UTC 
From: Adam Duskett <Aduskett@gmail.com>

Daphne is a HTTP, HTTP2 and WebSocket protocol server for ASGI and ASGI-HTTP,
developed to power Django Channels.

It supports automatic negotiation of protocols; there's no need for URL
prefixing to determine WebSocket endpoints versus HTTP endpoints.

In addition, add the patch: remove pytest-runner-requirement.
Setup and runtime work without without pytest-runner as such, it is not actually
a requirement for building.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 ...001-remove-pytest-runner-requirement.patch | 27 +++++++++++++++++++
 package/python-daphne/Config.in               | 13 +++++++++
 package/python-daphne/python-daphne.hash      |  5 ++++
 package/python-daphne/python-daphne.mk        | 14 ++++++++++
 6 files changed, 61 insertions(+)
 create mode 100644 package/python-daphne/0001-remove-pytest-runner-requirement.patch
 create mode 100644 package/python-daphne/Config.in
 create mode 100644 package/python-daphne/python-daphne.hash
 create mode 100644 package/python-daphne/python-daphne.mk

Comments

Yegor Yefremov Aug. 4, 2019, 5:58 a.m. UTC | #1 
On Sun, Aug 4, 2019 at 3:16 AM <aduskett@gmail.com> wrote:
>
> From: Adam Duskett <Aduskett@gmail.com>
>
> Daphne is a HTTP, HTTP2 and WebSocket protocol server for ASGI and ASGI-HTTP,
> developed to power Django Channels.
>
> It supports automatic negotiation of protocols; there's no need for URL
> prefixing to determine WebSocket endpoints versus HTTP endpoints.
>
> In addition, add the patch: remove pytest-runner-requirement.
> Setup and runtime work without without pytest-runner as such, it is not actually
> a requirement for building.
>
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> ---
>  DEVELOPERS                                    |  1 +
>  package/Config.in                             |  1 +
>  ...001-remove-pytest-runner-requirement.patch | 27 +++++++++++++++++++
>  package/python-daphne/Config.in               | 13 +++++++++
>  package/python-daphne/python-daphne.hash      |  5 ++++
>  package/python-daphne/python-daphne.mk        | 14 ++++++++++
>  6 files changed, 61 insertions(+)
>  create mode 100644 package/python-daphne/0001-remove-pytest-runner-requirement.patch
>  create mode 100644 package/python-daphne/Config.in
>  create mode 100644 package/python-daphne/python-daphne.hash
>  create mode 100644 package/python-daphne/python-daphne.mk
>
> diff --git a/DEVELOPERS b/DEVELOPERS
> index df1735cdde..0e3e93b15f 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -57,6 +57,7 @@ F:    package/openjdk-bin/
>  F:     package/php/
>  F:     package/policycoreutils/
>  F:     package/python3/
> +F:     package/python-daphne/
>  F:     package/python-django-enumfields/
>  F:     package/python-flask-sqlalchemy/
>  F:     package/python-hiredis/
> diff --git a/package/Config.in b/package/Config.in
> index e0080d2180..c81067192b 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -870,6 +870,7 @@ menu "External python modules"
>         source "package/python-cycler/Config.in"
>         source "package/python-daemon/Config.in"
>         source "package/python-daemonize/Config.in"
> +       source "package/python-daphne/Config.in"
>         source "package/python-dataproperty/Config.in"
>         source "package/python-dateutil/Config.in"
>         source "package/python-decorator/Config.in"
> diff --git a/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/package/python-daphne/0001-remove-pytest-runner-requirement.patch
> new file mode 100644
> index 0000000000..c471d60e8c
> --- /dev/null
> +++ b/package/python-daphne/0001-remove-pytest-runner-requirement.patch
> @@ -0,0 +1,27 @@
> +From f9d881cc55c89f51240f93308713216cfec793eb Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <Aduskett@gmail.com>
> +Date: Sat, 3 Aug 2019 14:23:19 -0400
> +Subject: [PATCH] remove pytest-runner requirement
> +
> +Setup does not actually require pytest-runner. As such, remove it.
> +
> +Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> +---
> + setup.py | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/setup.py b/setup.py
> +index 64e94f1..4e3abb0 100755
> +--- a/setup.py
> ++++ b/setup.py
> +@@ -23,7 +23,6 @@ setup(
> +     packages=find_packages() + ["twisted.plugins"],
> +     include_package_data=True,
> +     install_requires=["twisted>=18.7", "autobahn>=0.18", "asgiref~=3.0"],
> +-    setup_requires=["pytest-runner"],
> +     extras_require={
> +         "tests": ["hypothesis~=3.88", "pytest~=3.10", "pytest-asyncio~=0.8"]
> +     },
> +--
> +2.21.0
> +
> diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in
> new file mode 100644
> index 0000000000..b60004976d
> --- /dev/null
> +++ b/package/python-daphne/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_PYTHON_DAPHNE
> +       bool "python-daphne"
> +       select BR2_PACKAGE_PYTHON_TWISTED # runtime
> +       select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime
> +       select BR2_PACKAGE_PYTHON_ASGIREF # runtime
> +       help
> +         Daphne is a HTTP, HTTP2 and WebSocket protocol server for
> +         ASGI and ASGI-HTTP, developed to power Django Channels.
> +         It supports automatic negotiation of protocols; there's no
> +         need for URL prefixing to determine WebSocket endpoints
> +         versus HTTP endpoints.
> +
> +         https://github.com/django/daphne
> diff --git a/package/python-daphne/python-daphne.hash b/package/python-daphne/python-daphne.hash
> new file mode 100644
> index 0000000000..71439a77e1
> --- /dev/null
> +++ b/package/python-daphne/python-daphne.hash
> @@ -0,0 +1,5 @@
> +# md5, sha256 from https://pypi.org/pypi/daphne/json
> +md5    cac7352d0ebdde4f0cc245ae0b0682f8  daphne-2.3.0.tar.gz
> +sha256 2329b7a74b5559f7ea012879c10ba945c3a53df7d8d2b5932a904e3b4c9abcc2  daphne-2.3.0.tar.gz
> +# Locally computed sha256
> +sha256 55d7d6117493d69de1c7c211b947b910a715030366f1b636d28cf6891dfc1f3d PKG-INFO
> diff --git a/package/python-daphne/python-daphne.mk b/package/python-daphne/python-daphne.mk
> new file mode 100644
> index 0000000000..ac65dcd779
> --- /dev/null
> +++ b/package/python-daphne/python-daphne.mk
> @@ -0,0 +1,14 @@
> +################################################################################
> +#
> +# python-daphne
> +#
> +################################################################################
> +
> +PYTHON_DAPHNE_VERSION = 2.3.0
> +PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz
> +PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/7b/f1/994f55248e27059e160f9d07bf5d325a9891b99daf1eb775a14110e91e5b
> +PYTHON_DAPHNE_SETUP_TYPE = setuptools
> +PYTHON_DAPHNE_LICENSE = BSD

According to [1] it is BSD-3-Clause.

[1] https://github.com/django/daphne/blob/master/LICENSE

Yegor

> +PYTHON_DAPHNE_LICENSE_FILES = PKG-INFO
> +
> +$(eval $(python-package))
> --
> 2.21.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni Sept. 30, 2019, 7:33 p.m. UTC | #2 
Hello,

On Sat,  3 Aug 2019 21:16:27 -0400
aduskett@gmail.com wrote:

> From: Adam Duskett <Aduskett@gmail.com>
> 
> Daphne is a HTTP, HTTP2 and WebSocket protocol server for ASGI and ASGI-HTTP,
> developed to power Django Channels.
> 
> It supports automatic negotiation of protocols; there's no need for URL
> prefixing to determine WebSocket endpoints versus HTTP endpoints.
> 
> In addition, add the patch: remove pytest-runner-requirement.
> Setup and runtime work without without pytest-runner as such, it is not actually
> a requirement for building.
> 
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>

I've applied, but after making a number of changes, and I also have a
few comments/suggestions. See below.

> diff --git a/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/package/python-daphne/0001-remove-pytest-runner-requirement.patch
> new file mode 100644
> index 0000000000..c471d60e8c
> --- /dev/null
> +++ b/package/python-daphne/0001-remove-pytest-runner-requirement.patch
> @@ -0,0 +1,27 @@
> +From f9d881cc55c89f51240f93308713216cfec793eb Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <Aduskett@gmail.com>
> +Date: Sat, 3 Aug 2019 14:23:19 -0400
> +Subject: [PATCH] remove pytest-runner requirement
> +
> +Setup does not actually require pytest-runner. As such, remove it.
> +
> +Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> +---
> + setup.py | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/setup.py b/setup.py
> +index 64e94f1..4e3abb0 100755
> +--- a/setup.py
> ++++ b/setup.py
> +@@ -23,7 +23,6 @@ setup(
> +     packages=find_packages() + ["twisted.plugins"],
> +     include_package_data=True,
> +     install_requires=["twisted>=18.7", "autobahn>=0.18", "asgiref~=3.0"],
> +-    setup_requires=["pytest-runner"],

Shouldn't the pytest-runner requirement be moved...

> +     extras_require={
> +         "tests": ["hypothesis~=3.88", "pytest~=3.10", "pytest-asyncio~=0.8"]

... here, if it's only needed for testing ?

That would perhaps make this change acceptable upstream ?

> diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in
> new file mode 100644
> index 0000000000..b60004976d
> --- /dev/null
> +++ b/package/python-daphne/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_PYTHON_DAPHNE
> +	bool "python-daphne"
> +	select BR2_PACKAGE_PYTHON_TWISTED # runtime
> +	select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime
> +	select BR2_PACKAGE_PYTHON_ASGIREF # runtime

Alphabetic ordering was not respected here.

In addition, python-daphne only works with Python 3.x, this is
documented in the README.md, and also it doesn't byte-compile with
Python 2.x.

Speaking of that, I think asgiref and autobahn also need Python 3.x.
Indeed, when I try to build python-daphne with Python 2.x, I get this:

Compiling usr/lib/python2.7/site-packages/asgiref/compatibility.py ...
  File "usr/lib/python2.7/site-packages/asgiref/compatibility.py", line 32
    async def new_application(scope, receive, send):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/asgiref/server.py ...
  File "usr/lib/python2.7/site-packages/asgiref/server.py", line 64
    async def handle(self):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/asgiref/sync.py ...
  File "usr/lib/python2.7/site-packages/asgiref/sync.py", line 134
    async def main_wrap(self, args, kwargs, call_result, source_thread):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/asgiref/testing.py ...
  File "usr/lib/python2.7/site-packages/asgiref/testing.py", line 24
    async def wait(self, timeout=1):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/asgiref/timeout.py ...
  File "usr/lib/python2.7/site-packages/asgiref/timeout.py", line 34
    timeout: Optional[float],
           ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/asgiref/wsgi.py ...
  File "usr/lib/python2.7/site-packages/asgiref/wsgi.py", line 14
    async def __call__(self, scope, receive, send):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/autobahn/xbr/_buyer.py ...
  File "usr/lib/python2.7/site-packages/autobahn/xbr/_buyer.py", line 195
    async def stop(self):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/autobahn/xbr/_interfaces.py ...
  File "usr/lib/python2.7/site-packages/autobahn/xbr/_interfaces.py", line 141
    async def start(self, session):
        ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/autobahn/xbr/_seller.py ...
  File "usr/lib/python2.7/site-packages/autobahn/xbr/_seller.py", line 447
    async def balance(self):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/daphne/cli.py ...
  File "usr/lib/python2.7/site-packages/daphne/cli.py", line 29
    async def asgi(self, receive, send, scope):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/daphne/server.py ...
  File "usr/lib/python2.7/site-packages/daphne/server.py", line 213
    async def handle_reply(self, protocol, message):
            ^
SyntaxError: invalid syntax

Compiling usr/lib/python2.7/site-packages/daphne/testing.py ...
  File "usr/lib/python2.7/site-packages/daphne/testing.py", line 166
    async def __call__(self, send, receive):
            ^
SyntaxError: invalid syntax



> +PYTHON_DAPHNE_VERSION = 2.3.0
> +PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz
> +PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/7b/f1/994f55248e27059e160f9d07bf5d325a9891b99daf1eb775a14110e91e5b
> +PYTHON_DAPHNE_SETUP_TYPE = setuptools
> +PYTHON_DAPHNE_LICENSE = BSD

As suggested by Yegor, I fixed that to say BSD-3-Clause. Could you
contact upstream so that the LICENSE file that is in their Github repo
makes its way to the tarball provided on PyPi ?

Thanks!

Thomas
Thomas Petazzoni Sept. 30, 2019, 7:58 p.m. UTC | #3 
Hello,

+Yegor in the loop.

On Mon, 30 Sep 2019 21:33:47 +0200
Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote:

> Speaking of that, I think asgiref and autobahn also need Python 3.x.
> Indeed, when I try to build python-daphne with Python 2.x, I get this:
> 
> Compiling usr/lib/python2.7/site-packages/asgiref/compatibility.py ...
>   File "usr/lib/python2.7/site-packages/asgiref/compatibility.py", line 32
>     async def new_application(scope, receive, send):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/asgiref/server.py ...
>   File "usr/lib/python2.7/site-packages/asgiref/server.py", line 64
>     async def handle(self):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/asgiref/sync.py ...
>   File "usr/lib/python2.7/site-packages/asgiref/sync.py", line 134
>     async def main_wrap(self, args, kwargs, call_result, source_thread):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/asgiref/testing.py ...
>   File "usr/lib/python2.7/site-packages/asgiref/testing.py", line 24
>     async def wait(self, timeout=1):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/asgiref/timeout.py ...
>   File "usr/lib/python2.7/site-packages/asgiref/timeout.py", line 34
>     timeout: Optional[float],
>            ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/asgiref/wsgi.py ...
>   File "usr/lib/python2.7/site-packages/asgiref/wsgi.py", line 14
>     async def __call__(self, scope, receive, send):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/autobahn/xbr/_buyer.py ...
>   File "usr/lib/python2.7/site-packages/autobahn/xbr/_buyer.py", line 195
>     async def stop(self):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/autobahn/xbr/_interfaces.py ...
>   File "usr/lib/python2.7/site-packages/autobahn/xbr/_interfaces.py", line 141
>     async def start(self, session):
>         ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/autobahn/xbr/_seller.py ...
>   File "usr/lib/python2.7/site-packages/autobahn/xbr/_seller.py", line 447
>     async def balance(self):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/daphne/cli.py ...
>   File "usr/lib/python2.7/site-packages/daphne/cli.py", line 29
>     async def asgi(self, receive, send, scope):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/daphne/server.py ...
>   File "usr/lib/python2.7/site-packages/daphne/server.py", line 213
>     async def handle_reply(self, protocol, message):
>             ^
> SyntaxError: invalid syntax
> 
> Compiling usr/lib/python2.7/site-packages/daphne/testing.py ...
>   File "usr/lib/python2.7/site-packages/daphne/testing.py", line 166
>     async def __call__(self, send, receive):
>             ^
> SyntaxError: invalid syntax

Now that I think more about this: the build should have aborted due to
these compilation failures, but it did not. Due to this, such problems
are not caught by our autobuilders. It probably makes sense to have a
look and see why the build doesn't abort as it should.

Thanks,

Thomas
diff mbox series

Patch

diff --git a/DEVELOPERS b/DEVELOPERS
index df1735cdde..0e3e93b15f 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -57,6 +57,7 @@  F:	package/openjdk-bin/
 F:	package/php/
 F:	package/policycoreutils/
 F:	package/python3/
+F:	package/python-daphne/
 F:	package/python-django-enumfields/
 F:	package/python-flask-sqlalchemy/
 F:	package/python-hiredis/
diff --git a/package/Config.in b/package/Config.in
index e0080d2180..c81067192b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -870,6 +870,7 @@  menu "External python modules"
 	source "package/python-cycler/Config.in"
 	source "package/python-daemon/Config.in"
 	source "package/python-daemonize/Config.in"
+	source "package/python-daphne/Config.in"
 	source "package/python-dataproperty/Config.in"
 	source "package/python-dateutil/Config.in"
 	source "package/python-decorator/Config.in"
diff --git a/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/package/python-daphne/0001-remove-pytest-runner-requirement.patch
new file mode 100644
index 0000000000..c471d60e8c
--- /dev/null
+++ b/package/python-daphne/0001-remove-pytest-runner-requirement.patch
@@ -0,0 +1,27 @@ 
+From f9d881cc55c89f51240f93308713216cfec793eb Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Aduskett@gmail.com>
+Date: Sat, 3 Aug 2019 14:23:19 -0400
+Subject: [PATCH] remove pytest-runner requirement
+
+Setup does not actually require pytest-runner. As such, remove it.
+
+Signed-off-by: Adam Duskett <Aduskett@gmail.com>
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 64e94f1..4e3abb0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -23,7 +23,6 @@ setup(
+     packages=find_packages() + ["twisted.plugins"],
+     include_package_data=True,
+     install_requires=["twisted>=18.7", "autobahn>=0.18", "asgiref~=3.0"],
+-    setup_requires=["pytest-runner"],
+     extras_require={
+         "tests": ["hypothesis~=3.88", "pytest~=3.10", "pytest-asyncio~=0.8"]
+     },
+-- 
+2.21.0
+
diff --git a/package/python-daphne/Config.in b/package/python-daphne/Config.in
new file mode 100644
index 0000000000..b60004976d
--- /dev/null
+++ b/package/python-daphne/Config.in
@@ -0,0 +1,13 @@ 
+config BR2_PACKAGE_PYTHON_DAPHNE
+	bool "python-daphne"
+	select BR2_PACKAGE_PYTHON_TWISTED # runtime
+	select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime
+	select BR2_PACKAGE_PYTHON_ASGIREF # runtime
+	help
+	  Daphne is a HTTP, HTTP2 and WebSocket protocol server for
+	  ASGI and ASGI-HTTP, developed to power Django Channels.
+	  It supports automatic negotiation of protocols; there's no
+	  need for URL prefixing to determine WebSocket endpoints
+	  versus HTTP endpoints.
+
+	  https://github.com/django/daphne
diff --git a/package/python-daphne/python-daphne.hash b/package/python-daphne/python-daphne.hash
new file mode 100644
index 0000000000..71439a77e1
--- /dev/null
+++ b/package/python-daphne/python-daphne.hash
@@ -0,0 +1,5 @@ 
+# md5, sha256 from https://pypi.org/pypi/daphne/json
+md5	cac7352d0ebdde4f0cc245ae0b0682f8  daphne-2.3.0.tar.gz
+sha256	2329b7a74b5559f7ea012879c10ba945c3a53df7d8d2b5932a904e3b4c9abcc2  daphne-2.3.0.tar.gz
+# Locally computed sha256
+sha256 55d7d6117493d69de1c7c211b947b910a715030366f1b636d28cf6891dfc1f3d PKG-INFO
diff --git a/package/python-daphne/python-daphne.mk b/package/python-daphne/python-daphne.mk
new file mode 100644
index 0000000000..ac65dcd779
--- /dev/null
+++ b/package/python-daphne/python-daphne.mk
@@ -0,0 +1,14 @@ 
+################################################################################
+#
+# python-daphne
+#
+################################################################################
+
+PYTHON_DAPHNE_VERSION = 2.3.0
+PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz
+PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/7b/f1/994f55248e27059e160f9d07bf5d325a9891b99daf1eb775a14110e91e5b
+PYTHON_DAPHNE_SETUP_TYPE = setuptools
+PYTHON_DAPHNE_LICENSE = BSD
+PYTHON_DAPHNE_LICENSE_FILES = PKG-INFO
+
+$(eval $(python-package))