Преглед на файлове

HUE-8737 [ci] Switch to Python 3.8 for the Python 3 test branch

This will catch new keywords like `async` and other module changes
not in 3.6.

Bump a few Python modules not compatible with 3.8.

git push origin HEAD:py3-ci -f
Romain преди 6 години
родител
ревизия
b645e9eb8a
променени са 5 файла, в които са добавени 12 реда и са изтрити 20 реда
  1. 5 6
      .circleci/config.yml
  2. 4 9
      desktop/core/requirements_py3.txt
  3. 0 1
      ext/thirdparty/README.md
  4. 1 3
      tools/app_reg/common.py
  5. 2 1
      tools/app_reg/registry.py

+ 5 - 6
.circleci/config.yml

@@ -7,8 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
-      # - image: circleci/python:3.6.1
+      # - image: circleci/python:3.8.0
       - image: gethue/hue:latest
 
       # Specify service dependencies here if necessary
@@ -122,7 +121,7 @@ jobs:
 
   commit:
     docker:
-      - image: circleci/python:3.6.1
+      - image: circleci/python:3.8.0
 
     working_directory: ~/repo
 
@@ -140,7 +139,7 @@ jobs:
 
   build-py3:
     docker:
-      - image: gethue/hue:latest # Should be circleci/python:3.6.1 at some point
+      - image: gethue/hue:latest # Should be circleci/python:3.x at some point
 
     working_directory: ~/repo
 
@@ -157,9 +156,9 @@ jobs:
       - run:
           name: compile
           command: |
-            apt-get install -y python3.6-dev libsnappy-dev # This should not be needed as some point
+            apt-get install -y python3.8-dev python3.8-venv python3.8-distutils libsnappy-dev # This should not be needed as some point
 
-            export PYTHON_VER=python3.6
+            export PYTHON_VER=python3.8
             make apps
 
       - run:

+ 4 - 9
desktop/core/requirements_py3.txt

@@ -8,12 +8,12 @@ billiard==3.5.0.5
 boto==2.46.1
 celery==4.2.1
 certifi==2018.1.18
-cffi==1.11.5
+cffi==1.13.2
 channels==2.1.6
 channels-redis==2.3.2
 colorama==0.3.2
 configobj==5.0.6
-cryptography==2.1.4
+cryptography==2.8
 cx_Oracle==7.1.2
 defusedxml==0.5.0
 Django==1.11.20
@@ -52,7 +52,7 @@ kazoo==2.0
 kerberos==1.3.0
 kombu==4.3.0
 lockfile==0.12.2
-lxml==3.3.6
+lxml==4.4.2
 Mako==1.0.7
 Markdown==3.1
 MarkupSafe==0.9.3
@@ -64,17 +64,14 @@ nose==1.3.7
 odfpy==1.4.0
 openpyxl==2.6.2
 ordereddict==1.1
-parquet==1.1
 Paste==2.0.1
 ply==3.9
 py4j==0.9
 pyasn1==0.4.5
 pyasn1-modules==0.2.4
 pycparser==2.18
-pycrypto==2.6.1
-pycryptodomex==3.4.7
 pyformance==0.3.2
-Pygments==1.3.1
+Pygments==2.5.2
 pyOpenSSL==17.5.0
 pysaml2==4.4.0
 PySocks==1.7.0
@@ -99,8 +96,6 @@ six==1.12.0
 SQLAlchemy==1.3.8
 sqlparse==0.2.0
 tablib==0.13.0
-thrift==0.11.0
-thriftpy==0.3.9
 urllib3==1.22
 vine==1.2.0
 wheel==0.31.0

+ 0 - 1
ext/thirdparty/README.md

@@ -85,7 +85,6 @@ Checked-in third party dependencies
 |Y|ssl|1.15|Python|http://pypi.python.org/pypi/ssl/1.15|
 |Y|tablib|0.10.0|MIT|http://docs.python-tablib.org/en/latest/|
 |Y|Thrift|0.9.1|Apache|http://incubator.apache.org/thrift/download/|
-|Y|thriftpy|0.3.9|Apache|https://github.com/eleme/thriftpy|
 |Y|urllib2_kerberos|0.1.6|ASL2|http://pypi.python.org/pypi/urllib2_kerberos|
 
 ---

+ 1 - 3
tools/app_reg/common.py

@@ -21,8 +21,6 @@ import os
 import sys
 from posixpath import curdir, sep, pardir, join
 
-if sys.version_info[0] > 2:
-  from past.builtins import cmp
 
 # The root of the Hue installation
 INSTALL_ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..'))
@@ -31,7 +29,7 @@ INSTALL_ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '.
 APPS_ROOT = os.path.join(INSTALL_ROOT, 'apps')
 
 # Directory holding app.reg
-HUE_APP_REG_DIR = os.environ.get("HUE_APP_REG_DIR", INSTALL_ROOT) 
+HUE_APP_REG_DIR = os.environ.get("HUE_APP_REG_DIR", INSTALL_ROOT)
 
 # Directory holding hue.pth
 HUE_PTH_DIR = os.environ.get('HUE_PTH_DIR', None)

+ 2 - 1
tools/app_reg/registry.py

@@ -31,10 +31,11 @@ from common import cmp
 
 if sys.version_info[0] > 2:
   from builtins import object
-  from past.builtins import cmp
+
 
 LOG = logging.getLogger(__name__)
 
+
 class AppRegistry(object):
   """
   Represents a registry.