From 91ccf33829836e22de0dd0601b4a5655f01147f0 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 13:29:31 -0500 Subject: [PATCH 1/3] news fragment --- newsfragments/3608.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3608.minor diff --git a/newsfragments/3608.minor b/newsfragments/3608.minor new file mode 100644 index 000000000..e69de29bb From 7c9e757f70546645d02cf3dcefda7b4041ccf9b7 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 13:29:36 -0500 Subject: [PATCH 2/3] go back to a released txi2p for python 2 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5dc68d367..34f16e45f 100644 --- a/setup.py +++ b/setup.py @@ -154,7 +154,8 @@ i2p_requires = [ # txi2p has Python 3 support, but it's unreleased: https://github.com/str4d/txi2p/issues/10. # URL lookups are in PEP-508 (via https://stackoverflow.com/a/54794506). # Also see the comment in tor_requires. - "txi2p @ git+https://github.com/str4d/txi2p@0611b9a86172cb70d2f5e415a88eee9f230590b3#egg=txi2p", + "txi2p; python_version < '3.0'", + "txi2p @ git+https://github.com/str4d/txi2p@0611b9a86172cb70d2f5e415a88eee9f230590b3#egg=txi2p; python_version > '3.0'", ] if len(sys.argv) > 1 and sys.argv[1] == '--fakedependency': From 7b82a1230f82d3ecbbe227ade3610615518a3e1a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 1 Mar 2021 13:47:39 -0500 Subject: [PATCH 3/3] Drop txi2p for Python 3 entirely PEP-508 "URL lookups" are unsupported in packages released on PyPI --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 34f16e45f..ed48bf789 100644 --- a/setup.py +++ b/setup.py @@ -152,10 +152,7 @@ tor_requires = [ i2p_requires = [ # txi2p has Python 3 support, but it's unreleased: https://github.com/str4d/txi2p/issues/10. - # URL lookups are in PEP-508 (via https://stackoverflow.com/a/54794506). - # Also see the comment in tor_requires. "txi2p; python_version < '3.0'", - "txi2p @ git+https://github.com/str4d/txi2p@0611b9a86172cb70d2f5e415a88eee9f230590b3#egg=txi2p; python_version > '3.0'", ] if len(sys.argv) > 1 and sys.argv[1] == '--fakedependency':