Ottomata has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/402397 )
Change subject: Update build_wheels.sh to python3; update build artifacts for python3 ...................................................................... Update build_wheels.sh to python3; update build artifacts for python3 create_virtualenv.sh shouldn't use --system-site-packages, as installed numpy can conflict with superset's panda's numpy. Bug: T182688 Change-Id: Ifbcd0e8aa2959f78a9c1c2daa0cda623a3c18663 --- R artifacts/jessie/Flask_AppBuilder-1.9.4-py3-none-any.whl R artifacts/jessie/Flask_Babel-0.11.1-py3-none-any.whl R artifacts/jessie/Flask_Cache-0.13.1-py3-none-any.whl R artifacts/jessie/Flask_Login-0.2.11-py3-none-any.whl R artifacts/jessie/Flask_Migrate-2.0.3-py3-none-any.whl D artifacts/jessie/Flask_OpenID-1.2.5-py2-none-any.whl A artifacts/jessie/Flask_OpenID-1.2.5-py3-none-any.whl R artifacts/jessie/Flask_SQLAlchemy-2.1-py3-none-any.whl R artifacts/jessie/Flask_Script-2.0.5-py3-none-any.whl R artifacts/jessie/Flask_Testing-0.6.2-py3-none-any.whl R artifacts/jessie/Mako-1.0.7-py3-none-any.whl D artifacts/jessie/Markdown-2.6.8-py2-none-any.whl A artifacts/jessie/Markdown-2.6.8-py3-none-any.whl D artifacts/jessie/MarkupSafe-1.0-cp27-none-linux_x86_64.whl A artifacts/jessie/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl R artifacts/jessie/PyHive-0.5.0-py3-none-any.whl R artifacts/jessie/SQLAlchemy-1.1.9-cp34-cp34m-linux_x86_64.whl R artifacts/jessie/SQLAlchemy_Utils-0.32.16-py3-none-any.whl M artifacts/jessie/WTForms-2.1-py2.py3-none-any.whl D artifacts/jessie/Werkzeug-0.12.2-py2.py3-none-any.whl A artifacts/jessie/Werkzeug-0.14.1-py2.py3-none-any.whl M artifacts/jessie/alembic-0.9.6-py2.py3-none-any.whl D artifacts/jessie/anyjson-0.3.3-py2-none-any.whl A artifacts/jessie/anyjson-0.3.3-py3-none-any.whl D artifacts/jessie/asn1crypto-0.23.0-py2.py3-none-any.whl A artifacts/jessie/asn1crypto-0.24.0-py2.py3-none-any.whl D artifacts/jessie/backports.ssl_match_hostname-3.5.0.1-py2-none-any.whl D artifacts/jessie/billiard-3.3.0.23-cp27-none-linux_x86_64.whl A artifacts/jessie/billiard-3.3.0.23-py3-none-any.whl D artifacts/jessie/cffi-1.11.2-cp27-none-linux_x86_64.whl A artifacts/jessie/cffi-1.11.2-cp34-cp34m-linux_x86_64.whl D artifacts/jessie/cryptography-1.9-cp27-none-linux_x86_64.whl A artifacts/jessie/cryptography-1.9-cp34-cp34m-linux_x86_64.whl A artifacts/jessie/defusedxml-0.5.0-py2.py3-none-any.whl D artifacts/jessie/docutils-0.14-py2-none-any.whl A artifacts/jessie/docutils-0.14-py3-none-any.whl D artifacts/jessie/enum34-1.1.6-py2-none-any.whl M artifacts/jessie/flower-0.9.1-py2.py3-none-any.whl R artifacts/jessie/future-0.16.0-py3-none-any.whl D artifacts/jessie/futures-3.2.0-py2-none-any.whl R artifacts/jessie/humanize-0.5.1-py3-none-any.whl D artifacts/jessie/ipaddress-1.0.18-py2-none-any.whl R artifacts/jessie/itsdangerous-0.24-py3-none-any.whl D artifacts/jessie/mysqlclient-1.3.12-cp27-none-linux_x86_64.whl A artifacts/jessie/mysqlclient-1.3.12-cp34-cp34m-linux_x86_64.whl D artifacts/jessie/numpy-1.13.3-cp27-none-linux_x86_64.whl A artifacts/jessie/numpy-1.13.3-cp34-cp34m-linux_x86_64.whl D artifacts/jessie/pandas-0.20.3-cp27-none-linux_x86_64.whl A artifacts/jessie/pandas-0.20.3-cp34-cp34m-linux_x86_64.whl R artifacts/jessie/parsedatetime-2.0-py3-none-any.whl M artifacts/jessie/pycparser-2.18-py2.py3-none-any.whl A artifacts/jessie/python3_openid-3.1.0-py3-none-any.whl A artifacts/jessie/python_dateutil-2.6.1-py2.py3-none-any.whl D artifacts/jessie/python_editor-1.0.3-py2-none-any.whl A artifacts/jessie/python_editor-1.0.3-py3-none-any.whl D artifacts/jessie/python_openid-2.2.5-py2-none-any.whl D artifacts/jessie/sasl-0.2.1-cp27-none-linux_x86_64.whl A artifacts/jessie/sasl-0.2.1-cp34-cp34m-linux_x86_64.whl D artifacts/jessie/simplejson-3.10.0-cp27-none-linux_x86_64.whl A artifacts/jessie/simplejson-3.10.0-cp34-cp34m-linux_x86_64.whl A artifacts/jessie/six-1.11.0-py2.py3-none-any.whl R artifacts/jessie/superset-0.20.6-py3-none-any.whl D artifacts/jessie/thrift-0.10.0-cp27-none-linux_x86_64.whl A artifacts/jessie/thrift-0.10.0-cp34-cp34m-linux_x86_64.whl D artifacts/jessie/thrift_sasl-0.3.0-py2-none-any.whl A artifacts/jessie/thrift_sasl-0.3.0-py3-none-any.whl R artifacts/jessie/tornado-4.2-cp34-cp34m-linux_x86_64.whl M build_wheels.sh M create_virtualenv.sh 69 files changed, 33 insertions(+), 12 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/artifacts/jessie/Flask_AppBuilder-1.9.4-py2-none-any.whl b/artifacts/jessie/Flask_AppBuilder-1.9.4-py3-none-any.whl similarity index 97% rename from artifacts/jessie/Flask_AppBuilder-1.9.4-py2-none-any.whl rename to artifacts/jessie/Flask_AppBuilder-1.9.4-py3-none-any.whl index 446446d..7f8898c 100644 --- a/artifacts/jessie/Flask_AppBuilder-1.9.4-py2-none-any.whl +++ b/artifacts/jessie/Flask_AppBuilder-1.9.4-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_Babel-0.11.1-py2-none-any.whl b/artifacts/jessie/Flask_Babel-0.11.1-py3-none-any.whl similarity index 64% rename from artifacts/jessie/Flask_Babel-0.11.1-py2-none-any.whl rename to artifacts/jessie/Flask_Babel-0.11.1-py3-none-any.whl index 6dba795..41f13b4 100644 --- a/artifacts/jessie/Flask_Babel-0.11.1-py2-none-any.whl +++ b/artifacts/jessie/Flask_Babel-0.11.1-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_Cache-0.13.1-py2-none-any.whl b/artifacts/jessie/Flask_Cache-0.13.1-py3-none-any.whl similarity index 77% rename from artifacts/jessie/Flask_Cache-0.13.1-py2-none-any.whl rename to artifacts/jessie/Flask_Cache-0.13.1-py3-none-any.whl index fba0adb..2974a61 100644 --- a/artifacts/jessie/Flask_Cache-0.13.1-py2-none-any.whl +++ b/artifacts/jessie/Flask_Cache-0.13.1-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_Login-0.2.11-py2-none-any.whl b/artifacts/jessie/Flask_Login-0.2.11-py3-none-any.whl similarity index 75% rename from artifacts/jessie/Flask_Login-0.2.11-py2-none-any.whl rename to artifacts/jessie/Flask_Login-0.2.11-py3-none-any.whl index fe6c1ae..eb80acc 100644 --- a/artifacts/jessie/Flask_Login-0.2.11-py2-none-any.whl +++ b/artifacts/jessie/Flask_Login-0.2.11-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_Migrate-2.0.3-py2-none-any.whl b/artifacts/jessie/Flask_Migrate-2.0.3-py3-none-any.whl similarity index 68% rename from artifacts/jessie/Flask_Migrate-2.0.3-py2-none-any.whl rename to artifacts/jessie/Flask_Migrate-2.0.3-py3-none-any.whl index 4deae78..ae3ad6f 100644 --- a/artifacts/jessie/Flask_Migrate-2.0.3-py2-none-any.whl +++ b/artifacts/jessie/Flask_Migrate-2.0.3-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_OpenID-1.2.5-py2-none-any.whl b/artifacts/jessie/Flask_OpenID-1.2.5-py2-none-any.whl deleted file mode 100644 index e8610af..0000000 --- a/artifacts/jessie/Flask_OpenID-1.2.5-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/Flask_OpenID-1.2.5-py3-none-any.whl b/artifacts/jessie/Flask_OpenID-1.2.5-py3-none-any.whl new file mode 100644 index 0000000..5fb9923 --- /dev/null +++ b/artifacts/jessie/Flask_OpenID-1.2.5-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_SQLAlchemy-2.1-py2-none-any.whl b/artifacts/jessie/Flask_SQLAlchemy-2.1-py3-none-any.whl similarity index 81% rename from artifacts/jessie/Flask_SQLAlchemy-2.1-py2-none-any.whl rename to artifacts/jessie/Flask_SQLAlchemy-2.1-py3-none-any.whl index 183df0c..a1deb1d 100644 --- a/artifacts/jessie/Flask_SQLAlchemy-2.1-py2-none-any.whl +++ b/artifacts/jessie/Flask_SQLAlchemy-2.1-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_Script-2.0.5-py2-none-any.whl b/artifacts/jessie/Flask_Script-2.0.5-py3-none-any.whl similarity index 79% rename from artifacts/jessie/Flask_Script-2.0.5-py2-none-any.whl rename to artifacts/jessie/Flask_Script-2.0.5-py3-none-any.whl index 31057e0..e313efd 100644 --- a/artifacts/jessie/Flask_Script-2.0.5-py2-none-any.whl +++ b/artifacts/jessie/Flask_Script-2.0.5-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Flask_Testing-0.6.2-py2-none-any.whl b/artifacts/jessie/Flask_Testing-0.6.2-py3-none-any.whl similarity index 67% rename from artifacts/jessie/Flask_Testing-0.6.2-py2-none-any.whl rename to artifacts/jessie/Flask_Testing-0.6.2-py3-none-any.whl index fb949ab..806c7eb 100644 --- a/artifacts/jessie/Flask_Testing-0.6.2-py2-none-any.whl +++ b/artifacts/jessie/Flask_Testing-0.6.2-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Mako-1.0.7-py2-none-any.whl b/artifacts/jessie/Mako-1.0.7-py3-none-any.whl similarity index 91% rename from artifacts/jessie/Mako-1.0.7-py2-none-any.whl rename to artifacts/jessie/Mako-1.0.7-py3-none-any.whl index 15054ca..a598dc4 100644 --- a/artifacts/jessie/Mako-1.0.7-py2-none-any.whl +++ b/artifacts/jessie/Mako-1.0.7-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Markdown-2.6.8-py2-none-any.whl b/artifacts/jessie/Markdown-2.6.8-py2-none-any.whl deleted file mode 100644 index 452920b..0000000 --- a/artifacts/jessie/Markdown-2.6.8-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/Markdown-2.6.8-py3-none-any.whl b/artifacts/jessie/Markdown-2.6.8-py3-none-any.whl new file mode 100644 index 0000000..ec163e5 --- /dev/null +++ b/artifacts/jessie/Markdown-2.6.8-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/MarkupSafe-1.0-cp27-none-linux_x86_64.whl b/artifacts/jessie/MarkupSafe-1.0-cp27-none-linux_x86_64.whl deleted file mode 100644 index 966cfc5..0000000 --- a/artifacts/jessie/MarkupSafe-1.0-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..17b776f --- /dev/null +++ b/artifacts/jessie/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/PyHive-0.5.0-py2-none-any.whl b/artifacts/jessie/PyHive-0.5.0-py3-none-any.whl similarity index 91% rename from artifacts/jessie/PyHive-0.5.0-py2-none-any.whl rename to artifacts/jessie/PyHive-0.5.0-py3-none-any.whl index 020e60e..d851d23 100644 --- a/artifacts/jessie/PyHive-0.5.0-py2-none-any.whl +++ b/artifacts/jessie/PyHive-0.5.0-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/SQLAlchemy-1.1.9-cp27-none-linux_x86_64.whl b/artifacts/jessie/SQLAlchemy-1.1.9-cp34-cp34m-linux_x86_64.whl similarity index 92% rename from artifacts/jessie/SQLAlchemy-1.1.9-cp27-none-linux_x86_64.whl rename to artifacts/jessie/SQLAlchemy-1.1.9-cp34-cp34m-linux_x86_64.whl index 0d41a96..d632c50 100644 --- a/artifacts/jessie/SQLAlchemy-1.1.9-cp27-none-linux_x86_64.whl +++ b/artifacts/jessie/SQLAlchemy-1.1.9-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/SQLAlchemy_Utils-0.32.16-py2-none-any.whl b/artifacts/jessie/SQLAlchemy_Utils-0.32.16-py3-none-any.whl similarity index 84% rename from artifacts/jessie/SQLAlchemy_Utils-0.32.16-py2-none-any.whl rename to artifacts/jessie/SQLAlchemy_Utils-0.32.16-py3-none-any.whl index 82164e1..14bebcf 100644 --- a/artifacts/jessie/SQLAlchemy_Utils-0.32.16-py2-none-any.whl +++ b/artifacts/jessie/SQLAlchemy_Utils-0.32.16-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/WTForms-2.1-py2.py3-none-any.whl b/artifacts/jessie/WTForms-2.1-py2.py3-none-any.whl index 3a6585c..0a3f5ad 100644 --- a/artifacts/jessie/WTForms-2.1-py2.py3-none-any.whl +++ b/artifacts/jessie/WTForms-2.1-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/Werkzeug-0.12.2-py2.py3-none-any.whl b/artifacts/jessie/Werkzeug-0.12.2-py2.py3-none-any.whl deleted file mode 100644 index 9a81bf8..0000000 --- a/artifacts/jessie/Werkzeug-0.12.2-py2.py3-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/Werkzeug-0.14.1-py2.py3-none-any.whl b/artifacts/jessie/Werkzeug-0.14.1-py2.py3-none-any.whl new file mode 100644 index 0000000..865d524 --- /dev/null +++ b/artifacts/jessie/Werkzeug-0.14.1-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/alembic-0.9.6-py2.py3-none-any.whl b/artifacts/jessie/alembic-0.9.6-py2.py3-none-any.whl index 5d2fcb4..b2b0f45 100644 --- a/artifacts/jessie/alembic-0.9.6-py2.py3-none-any.whl +++ b/artifacts/jessie/alembic-0.9.6-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/anyjson-0.3.3-py2-none-any.whl b/artifacts/jessie/anyjson-0.3.3-py2-none-any.whl deleted file mode 100644 index fd36be3..0000000 --- a/artifacts/jessie/anyjson-0.3.3-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/anyjson-0.3.3-py3-none-any.whl b/artifacts/jessie/anyjson-0.3.3-py3-none-any.whl new file mode 100644 index 0000000..a70f87c --- /dev/null +++ b/artifacts/jessie/anyjson-0.3.3-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/asn1crypto-0.23.0-py2.py3-none-any.whl b/artifacts/jessie/asn1crypto-0.23.0-py2.py3-none-any.whl deleted file mode 100644 index f1e0937..0000000 --- a/artifacts/jessie/asn1crypto-0.23.0-py2.py3-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/asn1crypto-0.24.0-py2.py3-none-any.whl b/artifacts/jessie/asn1crypto-0.24.0-py2.py3-none-any.whl new file mode 100644 index 0000000..e76b271 --- /dev/null +++ b/artifacts/jessie/asn1crypto-0.24.0-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/backports.ssl_match_hostname-3.5.0.1-py2-none-any.whl b/artifacts/jessie/backports.ssl_match_hostname-3.5.0.1-py2-none-any.whl deleted file mode 100644 index 4f70224..0000000 --- a/artifacts/jessie/backports.ssl_match_hostname-3.5.0.1-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/billiard-3.3.0.23-cp27-none-linux_x86_64.whl b/artifacts/jessie/billiard-3.3.0.23-cp27-none-linux_x86_64.whl deleted file mode 100644 index 5f1e9cb..0000000 --- a/artifacts/jessie/billiard-3.3.0.23-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/billiard-3.3.0.23-py3-none-any.whl b/artifacts/jessie/billiard-3.3.0.23-py3-none-any.whl new file mode 100644 index 0000000..545703e --- /dev/null +++ b/artifacts/jessie/billiard-3.3.0.23-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/cffi-1.11.2-cp27-none-linux_x86_64.whl b/artifacts/jessie/cffi-1.11.2-cp27-none-linux_x86_64.whl deleted file mode 100644 index d6dca2a..0000000 --- a/artifacts/jessie/cffi-1.11.2-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/cffi-1.11.2-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/cffi-1.11.2-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..aef7b61 --- /dev/null +++ b/artifacts/jessie/cffi-1.11.2-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/cryptography-1.9-cp27-none-linux_x86_64.whl b/artifacts/jessie/cryptography-1.9-cp27-none-linux_x86_64.whl deleted file mode 100644 index bd99bde..0000000 --- a/artifacts/jessie/cryptography-1.9-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/cryptography-1.9-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/cryptography-1.9-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..803846d --- /dev/null +++ b/artifacts/jessie/cryptography-1.9-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/defusedxml-0.5.0-py2.py3-none-any.whl b/artifacts/jessie/defusedxml-0.5.0-py2.py3-none-any.whl new file mode 100644 index 0000000..6795a37 --- /dev/null +++ b/artifacts/jessie/defusedxml-0.5.0-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/docutils-0.14-py2-none-any.whl b/artifacts/jessie/docutils-0.14-py2-none-any.whl deleted file mode 100644 index ffb1999..0000000 --- a/artifacts/jessie/docutils-0.14-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/docutils-0.14-py3-none-any.whl b/artifacts/jessie/docutils-0.14-py3-none-any.whl new file mode 100644 index 0000000..97642c3 --- /dev/null +++ b/artifacts/jessie/docutils-0.14-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/enum34-1.1.6-py2-none-any.whl b/artifacts/jessie/enum34-1.1.6-py2-none-any.whl deleted file mode 100644 index 12be7c7..0000000 --- a/artifacts/jessie/enum34-1.1.6-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/flower-0.9.1-py2.py3-none-any.whl b/artifacts/jessie/flower-0.9.1-py2.py3-none-any.whl index ef12111..85bd76a 100644 --- a/artifacts/jessie/flower-0.9.1-py2.py3-none-any.whl +++ b/artifacts/jessie/flower-0.9.1-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/future-0.16.0-py2-none-any.whl b/artifacts/jessie/future-0.16.0-py3-none-any.whl similarity index 89% rename from artifacts/jessie/future-0.16.0-py2-none-any.whl rename to artifacts/jessie/future-0.16.0-py3-none-any.whl index ec34183..7dbc3ef 100644 --- a/artifacts/jessie/future-0.16.0-py2-none-any.whl +++ b/artifacts/jessie/future-0.16.0-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/futures-3.2.0-py2-none-any.whl b/artifacts/jessie/futures-3.2.0-py2-none-any.whl deleted file mode 100644 index c0659c1..0000000 --- a/artifacts/jessie/futures-3.2.0-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/humanize-0.5.1-py2-none-any.whl b/artifacts/jessie/humanize-0.5.1-py3-none-any.whl similarity index 78% rename from artifacts/jessie/humanize-0.5.1-py2-none-any.whl rename to artifacts/jessie/humanize-0.5.1-py3-none-any.whl index bc851e5..7643e79 100644 --- a/artifacts/jessie/humanize-0.5.1-py2-none-any.whl +++ b/artifacts/jessie/humanize-0.5.1-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/ipaddress-1.0.18-py2-none-any.whl b/artifacts/jessie/ipaddress-1.0.18-py2-none-any.whl deleted file mode 100644 index 8c2a276..0000000 --- a/artifacts/jessie/ipaddress-1.0.18-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/itsdangerous-0.24-py2-none-any.whl b/artifacts/jessie/itsdangerous-0.24-py3-none-any.whl similarity index 81% rename from artifacts/jessie/itsdangerous-0.24-py2-none-any.whl rename to artifacts/jessie/itsdangerous-0.24-py3-none-any.whl index 8a87e52..1d9bf37 100644 --- a/artifacts/jessie/itsdangerous-0.24-py2-none-any.whl +++ b/artifacts/jessie/itsdangerous-0.24-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/mysqlclient-1.3.12-cp27-none-linux_x86_64.whl b/artifacts/jessie/mysqlclient-1.3.12-cp27-none-linux_x86_64.whl deleted file mode 100644 index 8488678..0000000 --- a/artifacts/jessie/mysqlclient-1.3.12-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/mysqlclient-1.3.12-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/mysqlclient-1.3.12-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..d608d5e --- /dev/null +++ b/artifacts/jessie/mysqlclient-1.3.12-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/numpy-1.13.3-cp27-none-linux_x86_64.whl b/artifacts/jessie/numpy-1.13.3-cp27-none-linux_x86_64.whl deleted file mode 100644 index 3c5714b..0000000 --- a/artifacts/jessie/numpy-1.13.3-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/numpy-1.13.3-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/numpy-1.13.3-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..c2cee56 --- /dev/null +++ b/artifacts/jessie/numpy-1.13.3-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/pandas-0.20.3-cp27-none-linux_x86_64.whl b/artifacts/jessie/pandas-0.20.3-cp27-none-linux_x86_64.whl deleted file mode 100644 index ae414da..0000000 --- a/artifacts/jessie/pandas-0.20.3-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/pandas-0.20.3-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/pandas-0.20.3-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..466a31a --- /dev/null +++ b/artifacts/jessie/pandas-0.20.3-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/parsedatetime-2.0-py2-none-any.whl b/artifacts/jessie/parsedatetime-2.0-py3-none-any.whl similarity index 81% rename from artifacts/jessie/parsedatetime-2.0-py2-none-any.whl rename to artifacts/jessie/parsedatetime-2.0-py3-none-any.whl index 435399a..a8ac20d 100644 --- a/artifacts/jessie/parsedatetime-2.0-py2-none-any.whl +++ b/artifacts/jessie/parsedatetime-2.0-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/pycparser-2.18-py2.py3-none-any.whl b/artifacts/jessie/pycparser-2.18-py2.py3-none-any.whl index d1228a2..4fef8e1 100644 --- a/artifacts/jessie/pycparser-2.18-py2.py3-none-any.whl +++ b/artifacts/jessie/pycparser-2.18-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/python3_openid-3.1.0-py3-none-any.whl b/artifacts/jessie/python3_openid-3.1.0-py3-none-any.whl new file mode 100644 index 0000000..919a4fc --- /dev/null +++ b/artifacts/jessie/python3_openid-3.1.0-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/python_dateutil-2.6.1-py2.py3-none-any.whl b/artifacts/jessie/python_dateutil-2.6.1-py2.py3-none-any.whl new file mode 100644 index 0000000..97b3947 --- /dev/null +++ b/artifacts/jessie/python_dateutil-2.6.1-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/python_editor-1.0.3-py2-none-any.whl b/artifacts/jessie/python_editor-1.0.3-py2-none-any.whl deleted file mode 100644 index 8c8b5ee..0000000 --- a/artifacts/jessie/python_editor-1.0.3-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/python_editor-1.0.3-py3-none-any.whl b/artifacts/jessie/python_editor-1.0.3-py3-none-any.whl new file mode 100644 index 0000000..4b1b561 --- /dev/null +++ b/artifacts/jessie/python_editor-1.0.3-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/python_openid-2.2.5-py2-none-any.whl b/artifacts/jessie/python_openid-2.2.5-py2-none-any.whl deleted file mode 100644 index cc6e0c7..0000000 --- a/artifacts/jessie/python_openid-2.2.5-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/sasl-0.2.1-cp27-none-linux_x86_64.whl b/artifacts/jessie/sasl-0.2.1-cp27-none-linux_x86_64.whl deleted file mode 100644 index 36c8ec1..0000000 --- a/artifacts/jessie/sasl-0.2.1-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/sasl-0.2.1-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/sasl-0.2.1-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..a6cebf4 --- /dev/null +++ b/artifacts/jessie/sasl-0.2.1-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/simplejson-3.10.0-cp27-none-linux_x86_64.whl b/artifacts/jessie/simplejson-3.10.0-cp27-none-linux_x86_64.whl deleted file mode 100644 index 2104731..0000000 --- a/artifacts/jessie/simplejson-3.10.0-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/simplejson-3.10.0-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/simplejson-3.10.0-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..7498d68 --- /dev/null +++ b/artifacts/jessie/simplejson-3.10.0-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/six-1.11.0-py2.py3-none-any.whl b/artifacts/jessie/six-1.11.0-py2.py3-none-any.whl new file mode 100644 index 0000000..5996023 --- /dev/null +++ b/artifacts/jessie/six-1.11.0-py2.py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/superset-0.20.6-py2-none-any.whl b/artifacts/jessie/superset-0.20.6-py3-none-any.whl similarity index 99% rename from artifacts/jessie/superset-0.20.6-py2-none-any.whl rename to artifacts/jessie/superset-0.20.6-py3-none-any.whl index c13b191..4e974d2 100644 --- a/artifacts/jessie/superset-0.20.6-py2-none-any.whl +++ b/artifacts/jessie/superset-0.20.6-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/thrift-0.10.0-cp27-none-linux_x86_64.whl b/artifacts/jessie/thrift-0.10.0-cp27-none-linux_x86_64.whl deleted file mode 100644 index a757e5b..0000000 --- a/artifacts/jessie/thrift-0.10.0-cp27-none-linux_x86_64.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/thrift-0.10.0-cp34-cp34m-linux_x86_64.whl b/artifacts/jessie/thrift-0.10.0-cp34-cp34m-linux_x86_64.whl new file mode 100644 index 0000000..7c98af3 --- /dev/null +++ b/artifacts/jessie/thrift-0.10.0-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/artifacts/jessie/thrift_sasl-0.3.0-py2-none-any.whl b/artifacts/jessie/thrift_sasl-0.3.0-py2-none-any.whl deleted file mode 100644 index 8d55a94..0000000 --- a/artifacts/jessie/thrift_sasl-0.3.0-py2-none-any.whl +++ /dev/null Binary files differ diff --git a/artifacts/jessie/thrift_sasl-0.3.0-py3-none-any.whl b/artifacts/jessie/thrift_sasl-0.3.0-py3-none-any.whl new file mode 100644 index 0000000..006bab4 --- /dev/null +++ b/artifacts/jessie/thrift_sasl-0.3.0-py3-none-any.whl Binary files differ diff --git a/artifacts/jessie/tornado-4.2-cp27-none-linux_x86_64.whl b/artifacts/jessie/tornado-4.2-cp34-cp34m-linux_x86_64.whl similarity index 92% rename from artifacts/jessie/tornado-4.2-cp27-none-linux_x86_64.whl rename to artifacts/jessie/tornado-4.2-cp34-cp34m-linux_x86_64.whl index ab3255e..c9c4aec 100644 --- a/artifacts/jessie/tornado-4.2-cp27-none-linux_x86_64.whl +++ b/artifacts/jessie/tornado-4.2-cp34-cp34m-linux_x86_64.whl Binary files differ diff --git a/build_wheels.sh b/build_wheels.sh index 6e259a5..933d3f1 100755 --- a/build_wheels.sh +++ b/build_wheels.sh @@ -3,28 +3,50 @@ # Install all dependencies into artifacts/$dist. This should only be run # on a build server. +set -ex + # source common variables source $(dirname $0)/profile.sh +# Choose name for libmysqlclient-dev based on distribution name. +if [ "${dist}" == "jessie" ]; then + libmysqlclient_dev_package='libmysqlclient-dev' +else + libmysqlclient_dev_package='default-libmysqlclient-dev' +fi + sudo apt-get --yes install \ - python-pip \ - python-wheel \ - python-dev \ + python3-pip \ + python3-wheel \ + python3-dev \ + virtualenv \ build-essential \ libssl-dev \ libffi-dev \ libsasl2-dev \ libldap2-dev \ - libmysqlclient-dev - + $libmysqlclient_dev_package # If you update any requirements, you should also update this timestamp. # This makes it more likely that wheels built with the same versions # will be byte for byte identical. -export SOURCE_DATE_EPOCH=1512574740 - +export SOURCE_DATE_EPOCH=1515093288 rm -rf $wheels_dir mkdir -p $wheels_dir -pip wheel -w $wheels_dir -r $(dirname $0)/frozen-requirements.txt + + +# Build in a virtualenv, but install wheel files to $wheels_dir. +build_venv=/tmp/superset-build-venv +test -e $build_venv && rm -rf $build_venv +virtualenv --python python3 --system-site-packages $build_venv + +# Weird bug where numpy needs to be installed before pandas is built. +# https://github.com/pandas-dev/pandas/issues/16715#issuecomment-309498415 +# Build this wheel first and install it into our build virtualenv. +# This will let pandas build against the version of numpy that we will +# actually install. +$build_venv/bin/pip wheel -w $wheels_dir numpy +$build_venv/bin/pip install --no-index --find-links $wheels_dir numpy +$build_venv/bin/pip wheel -w $wheels_dir -r $(dirname $0)/frozen-requirements.txt diff --git a/create_virtualenv.sh b/create_virtualenv.sh index 01a1d68..0135030 100755 --- a/create_virtualenv.sh +++ b/create_virtualenv.sh @@ -6,10 +6,9 @@ source $(dirname $0)/profile.sh # remove any existing virtualenv -rm -rfv $venv +test -e $venv && echo "Deleting existent virtualenv at $venv" && rm -rf $venv mkdir -pv $venv -echo "Creating new virtualenv at $venv with wheels from $wheels_dir..." -# create a new virtualenv from wheels/ -virtualenv --system-site-packages --never-download $venv +echo "Creating new virtualenv at $venv with requirements from wheels in $wheels_dir..." +virtualenv --python python3 --never-download $venv $venv/bin/pip install --no-index --find-links $wheels_dir --requirement $deploy_dir/frozen-requirements.txt -- To view, visit https://gerrit.wikimedia.org/r/402397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifbcd0e8aa2959f78a9c1c2daa0cda623a3c18663 Gerrit-PatchSet: 3 Gerrit-Project: analytics/superset/deploy Gerrit-Branch: master Gerrit-Owner: Ottomata <ao...@wikimedia.org> Gerrit-Reviewer: Ottomata <ao...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits