mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-25 12:15:32 +03:00
490f9b19c9
Salt does not support Tornado 6 yet, so we need to package Tornado 5. This package is adjusted so that it can be installed alongside py3-tornado. This is done by renaming the module for tornado to tornado5. The test suite passes, except for some error that also happen without renaming the module, and the test suite has been disabled anyway.
87 lines
3.3 KiB
Diff
87 lines
3.3 KiB
Diff
diff --git a/MANIFEST.in b/MANIFEST.in
|
|
index 2ef76ae..d916528 100644
|
|
--- a/MANIFEST.in
|
|
+++ b/MANIFEST.in
|
|
@@ -1,21 +1,21 @@
|
|
recursive-include demos *.py *.yaml *.html *.css *.js *.xml *.sql README
|
|
recursive-include docs *
|
|
prune docs/build
|
|
-include tornado/speedups.c
|
|
-include tornado/test/README
|
|
-include tornado/test/csv_translations/fr_FR.csv
|
|
-include tornado/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo
|
|
-include tornado/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.po
|
|
-include tornado/test/options_test.cfg
|
|
-include tornado/test/static/robots.txt
|
|
-include tornado/test/static/sample.xml
|
|
-include tornado/test/static/sample.xml.gz
|
|
-include tornado/test/static/sample.xml.bz2
|
|
-include tornado/test/static/dir/index.html
|
|
-include tornado/test/static_foo.txt
|
|
-include tornado/test/templates/utf8.html
|
|
-include tornado/test/test.crt
|
|
-include tornado/test/test.key
|
|
+include tornado5/speedups.c
|
|
+include tornado5/test/README
|
|
+include tornado5/test/csv_translations/fr_FR.csv
|
|
+include tornado5/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo
|
|
+include tornado5/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.po
|
|
+include tornado5/test/options_test.cfg
|
|
+include tornado5/test/static/robots.txt
|
|
+include tornado5/test/static/sample.xml
|
|
+include tornado5/test/static/sample.xml.gz
|
|
+include tornado5/test/static/sample.xml.bz2
|
|
+include tornado5/test/static/dir/index.html
|
|
+include tornado5/test/static_foo.txt
|
|
+include tornado5/test/templates/utf8.html
|
|
+include tornado5/test/test.crt
|
|
+include tornado5/test/test.key
|
|
include LICENSE
|
|
include README.rst
|
|
include runtests.sh
|
|
diff --git a/setup.py b/setup.py
|
|
index 36f57b2..82ca19d 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -113,8 +113,8 @@ if (platform.python_implementation() == 'CPython' and
|
|
# This extension builds and works on pypy as well, although pypy's jit
|
|
# produces equivalent performance.
|
|
kwargs['ext_modules'] = [
|
|
- Extension('tornado.speedups',
|
|
- sources=['tornado/speedups.c']),
|
|
+ Extension('tornado5.speedups',
|
|
+ sources=['tornado5/speedups.c']),
|
|
]
|
|
|
|
if os.environ.get('TORNADO_EXTENSION') != '1':
|
|
@@ -148,14 +148,14 @@ if (not hasattr(ssl, 'SSLContext') or
|
|
"backported the necessary changes to older versions).")
|
|
|
|
setup(
|
|
- name="tornado",
|
|
+ name="tornado5",
|
|
version=version,
|
|
- packages=["tornado", "tornado.test", "tornado.platform"],
|
|
+ packages=["tornado5", "tornado5.test", "tornado5.platform"],
|
|
package_data={
|
|
# data files need to be listed both here (which determines what gets
|
|
# installed) and in MANIFEST.in (which determines what gets included
|
|
# in the sdist tarball)
|
|
- "tornado.test": [
|
|
+ "tornado5.test": [
|
|
"README",
|
|
"csv_translations/fr_FR.csv",
|
|
"gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo",
|
|
diff --git a/tornado/util.py b/tornado/util.py
|
|
index a42ebeb..c3d4946 100644
|
|
--- a/tornado/util.py
|
|
+++ b/tornado/util.py
|
|
@@ -164,7 +164,7 @@ def import_object(name):
|
|
True
|
|
>>> import_object('tornado.escape.utf8') is tornado.escape.utf8
|
|
True
|
|
- >>> import_object('tornado') is tornado
|
|
+ >>> import_object('tornado5') is tornado5
|
|
True
|
|
>>> import_object('tornado.missing_module')
|
|
Traceback (most recent call last):
|