From c587beb4b8a4c62926e8f8c080a57ddc5b5a82a4 Mon Sep 17 00:00:00 2001 From: "Pedro A. Aranda Gutierrez" Date: Mon, 6 Jun 2022 12:46:54 +0200 Subject: [PATCH 1/7] Add a requirements file as a test --- requirements.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..608996d25 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,20 @@ +Routes==2.5.1 +WebOb==1.8.7 +debtcollector==2.5.0 +dnspython==1.16.0 +eventlet==0.31.1 +greenlet==1.1.2 +msgpack==1.0.4 +netaddr==0.8.0 +oslo.config==8.8.0 +oslo.i18n==5.1.0 +ovs==2.17.1.post1 +packaging==20.9 +pbr==5.9.0 +pyparsing==3.0.9 +repoze.lru==0.7 +rfc3986==2.0.0 +sortedcontainers==2.4.0 +stevedore==3.5.0 +tinyrpc==1.0.4 +wrapt==1.14.1 From 7e3935aff7097a9819c3756975926fd8afa502a6 Mon Sep 17 00:00:00 2001 From: "Pedro A. Aranda Gutierrez" Date: Sun, 13 Nov 2022 11:43:26 +0100 Subject: [PATCH 2/7] Made Ryu install on Python3.10 (Ubuntu 22.04LTS) --- README.rst | 7 +++++++ tools/pip-requires | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 33d02c84c..40ed411f3 100644 --- a/README.rst +++ b/README.rst @@ -56,6 +56,13 @@ On Ubuntu(16.04 LTS or later):: % apt install gcc python-dev libffi-dev libssl-dev libxml2-dev libxslt1-dev zlib1g-dev +On Ubuntu(22.04 LTS): + +Install the master version from the eventlet github *before* anything else:: + + % pip install https://github.com/eventlet/eventlet/archive/master.zip + +And then follow the installation instructions Support ======= diff --git a/tools/pip-requires b/tools/pip-requires index 714cb3a63..55a23c2be 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -2,7 +2,7 @@ # NOTE: OpenStack avoids some versions of eventlet, because of the # following issue. # https://github.com/eventlet/eventlet/issues/401 -eventlet==0.31.1 +eventlet>=0.31.1 msgpack>=0.4.0 # RPC library, BGP speaker(net_cntl) netaddr oslo.config>=2.5.0 From 040a05b15de5ac8c07f05cf17ac975dbf558af6b Mon Sep 17 00:00:00 2001 From: "Pedro A. Aranda Gutierrez" Date: Sun, 13 Nov 2022 11:46:45 +0100 Subject: [PATCH 3/7] Cleanup --- requirements.txt | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 608996d25..000000000 --- a/requirements.txt +++ /dev/null @@ -1,20 +0,0 @@ -Routes==2.5.1 -WebOb==1.8.7 -debtcollector==2.5.0 -dnspython==1.16.0 -eventlet==0.31.1 -greenlet==1.1.2 -msgpack==1.0.4 -netaddr==0.8.0 -oslo.config==8.8.0 -oslo.i18n==5.1.0 -ovs==2.17.1.post1 -packaging==20.9 -pbr==5.9.0 -pyparsing==3.0.9 -repoze.lru==0.7 -rfc3986==2.0.0 -sortedcontainers==2.4.0 -stevedore==3.5.0 -tinyrpc==1.0.4 -wrapt==1.14.1 From 68acdbef5fb3f0ddfb60780139cfe923f947419d Mon Sep 17 00:00:00 2001 From: "Pedro A. Aranda Gutierrez" Date: Fri, 18 Nov 2022 16:41:53 +0100 Subject: [PATCH 4/7] New eventlet that solves the TimeoutError on Python3.10 --- tools/pip-requires | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/pip-requires b/tools/pip-requires index 55a23c2be..c09244a9b 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,8 +1,5 @@ -r ../pip-requirements.txt -# NOTE: OpenStack avoids some versions of eventlet, because of the -# following issue. -# https://github.com/eventlet/eventlet/issues/401 -eventlet>=0.31.1 +eventlet==0.33.2 # Solves TimeoutError msgpack>=0.4.0 # RPC library, BGP speaker(net_cntl) netaddr oslo.config>=2.5.0 From 6d525d4282ed10111b2393f4aed8daaec661cad9 Mon Sep 17 00:00:00 2001 From: "Pedro A. Aranda Gutierrez" Date: Fri, 18 Nov 2022 16:48:12 +0100 Subject: [PATCH 5/7] New eventlet is out... Should work with ubuntu 22.04 --- README.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.rst b/README.rst index 2b9aec3c8..aed14ee00 100644 --- a/README.rst +++ b/README.rst @@ -61,14 +61,6 @@ On Ubuntu(16.04 LTS or later):: % apt install gcc python-dev libffi-dev libssl-dev libxml2-dev libxslt1-dev zlib1g-dev -On Ubuntu(22.04 LTS): - -Install the master version from the eventlet github *before* anything else:: - - % pip install https://github.com/eventlet/eventlet/archive/master.zip - -And then follow the installation instructions - Support ======= Ryu Official site is ``_. From c379ee31674ca1ae6c5346f8a6df25ae32245de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20A=2E=20Aranda=20Guti=C3=A9rrez?= Date: Sun, 20 Nov 2022 07:18:38 +0100 Subject: [PATCH 6/7] Update README.rst Highlight that this fork works with recent Pythons --- README.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index aed14ee00..da0e6a82b 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,5 @@ -**PLEASE READ: RYU NOT CURRENTLY MAINTAINED** - - * The Ryu project needs new maintainers - please file an issue if you are able to assist. - * see OpenStack's os-ken (``_) for a maintained Ryu alternative. +**This fork will install and work with Python 3.10 and earlier** + * Tested on Ubuntu 22.04LTS for Python 3.10 and 20.04LTS for earlier Pythons What's Ryu ========== @@ -71,3 +69,8 @@ questions, suggestions, and patches, the mailing list is available at `_. `The ML archive at Gmane `_ is also available. + +**PLEASE READ: RYU NOT CURRENTLY MAINTAINED** + + * The Ryu project needs new maintainers - please file an issue if you are able to assist. + * see OpenStack's os-ken (``_) for a maintained Ryu alternative. From bbb77b9e9c1f0812214b4816a4aaf720aef1ef74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20A=2E=20Aranda=20Guti=C3=A9rrez?= Date: Wed, 15 Mar 2023 10:03:18 +0100 Subject: [PATCH 7/7] Update pip-requires Update pip-requires to cope with dnstypes errors --- tools/pip-requires | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pip-requires b/tools/pip-requires index c09244a9b..0bb116aeb 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,5 +1,5 @@ -r ../pip-requirements.txt -eventlet==0.33.2 # Solves TimeoutError +eventlet==0.33.3 # Solves TimeoutError, dnstypes msgpack>=0.4.0 # RPC library, BGP speaker(net_cntl) netaddr oslo.config>=2.5.0