Merge pull request #511 from OmkarPh/py3Support

Add support for python3

Author: pombredanne

.travis.yml

@@ -1,57 +1,67 @@
 matrix:
   include:
-    - os: linux
-      dist: xenial
+    - os: macos
       sudo: required
       language: node_js
-      node_js: 10
-      python: 2.7.13
+      node_js: 16
+      python: 3.7
+      osx_image: xcode11
       env:
         - CC=clang
         - CXX=clang++
         - npm_config_clang=1
       script:
-        - sudo apt install build-essential -y
         - npm install
         - npm test
         - python build.py
-    
-    - os: macos
+
+    - os: linux
+      dist: focal
       sudo: required
       language: node_js
-      node_js: 10
-      osx_image: xcode11
+      node_js: 16
+      python: 3.7
       env:
         - CC=clang
         - CXX=clang++
         - npm_config_clang=1
       script:
+        - sudo apt install build-essential -y
         - npm install
         - npm test
         - python build.py
 
     - os: linux
-      dist: xenial
-      python: 2.7.13
+      dist: bionic
       sudo: required
+      language: node_js
+      node_js: 16
+      python: 3.7
+      env:
+        - CC=clang
+        - CXX=clang++
+        - npm_config_clang=1
       script:
-        - sudo pip install Sphinx sphinx_rtd_theme doc8
-        - chmod +x ./docs/scripts/sphinx_build_link_check.sh
-        - chmod +x ./docs/scripts/doc8_style_check.sh
-        - "./docs/scripts/sphinx_build_link_check.sh"
-        - "./docs/scripts/doc8_style_check.sh"
-    
+        - sudo apt install build-essential -y
+        - npm install
+        - npm test
+        - python build.py
+
     - os: linux
       dist: xenial
-      python: 3.6
       sudo: required
+      language: node_js
+      node_js: 16
+      python: 3.7
+      env:
+        - CC=clang
+        - CXX=clang++
+        - npm_config_clang=1
       script:
-        - sudo pip install Sphinx sphinx_rtd_theme doc8
-        - chmod +x ./docs/scripts/sphinx_build_link_check.sh
-        - chmod +x ./docs/scripts/doc8_style_check.sh
-        - "./docs/scripts/sphinx_build_link_check.sh"
-        - "./docs/scripts/doc8_style_check.sh"
-
+        - sudo apt install build-essential -y
+        - npm install
+        - npm test
+        - python build.py
 
 addons:
   ssh_known_hosts: web.sourceforge.net

build.py

@@ -134,6 +134,7 @@ def get_git_version():
     # this may fail with exceptions
     cmd = 'git', 'describe', '--tags', '--long', '--dirty',
     version = subprocess.check_output(cmd, stderr=subprocess.STDOUT).strip()
+    version = version.decode('utf-8')
     dirty = version.endswith('-dirty')
     if dirty:
         version, _, _ = version.rpartition('-')
@@ -193,6 +194,7 @@ def build(clean=True, app_name=APP_NAME,
         npm_bin = subprocess.check_output(['npm', 'bin'], stderr=subprocess.STDOUT, shell=True)
     else:
         npm_bin = subprocess.check_output(['npm', 'bin'], stderr=subprocess.STDOUT,)
+    npm_bin = npm_bin.decode('utf-8')
     npm_bin = npm_bin.strip()
     print('using NPM bin at:', npm_bin)
 

docs/source/contribute/building.rst

@@ -35,14 +35,14 @@ Building Requirements
 Linux
 -----
 
-- Python 2.7
+- Python 3.7
 - `Node.js version <https://nodejs.org/en/download/package-manager/>`_ 6.x or later
 - npm 3.10.x or later but <= 5.2.0 (run ``npm install npm@5.2.0 -g``)
 
 MacOS
 -----
 
-- Python 2.7
+- Python 3.7
 - `Node.js <https://nodejs.org/en/>`_ >=6.x or later but <=8.9.4
 - npm 3.10.x or later but <= 5.2.0 (run ``npm install npm@5.2.0 -g``)
 - Command Line Tools for `Xcode <https://developer.apple.com/xcode/downloads/>`_
@@ -53,7 +53,7 @@ Windows
 
 - `Node.js <https://nodejs.org/en/>`_ 6.x or later
 - npm 3.10.x or later but <= 5.2.0 (``run npm install npm@5.2.0 -g``)
-- Python v2.7.x
+- Python v3.7.x
 
   * Make sure your Python path is set. To verify, open a command prompt and type
     ``python --version``. Then, the version of python will be displayed.

package-lock.json

@@ -30,7 +30,7 @@
     "asar": "^3.1.0",
     "chai": "^4.3.4",
     "chai-subset": "^1.6.0",
-    "electron": "^13.0.0",
+    "electron": "13.0.0",
     "electron-packager": "^15.4.0",
     "electron-rebuild": "^3.2.5",
     "eslint": "^8.6.0",
@@ -46,7 +46,7 @@
     "@electron/remote": "^2.0.1",
     "JSONStream": "^1.3.5",
     "packageurl-js": "^0.0.5",
-    "sequelize": "^4.44.3",
+    "sequelize": "4.44.3",
     "sequelize-cli": "6.3.0",
     "sqlite3": "^4.2.0"
   }