various updates

Berserker66 · Berserker66 · commit c9a372b2a497 · 2020-11-17T17:21:42.000+01:00
doesn't quite work yet
diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h
@@ -48,6 +48,8 @@
 #include "../../build/build_cefpython/cefpython_py37_fixed.h"
 #elif PY_MINOR_VERSION == 8
 #include "../../build/build_cefpython/cefpython_py38_fixed.h"
+#elif PY_MINOR_VERSION == 9
+#include "../../build/build_cefpython/cefpython_py39_fixed.h"
 #endif // PY_MINOR_VERSION
 #endif // PY_MAJOR_VERSION
 
diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi
@@ -1,7 +1,3 @@
 # This file was generated by setup.py
-
-# Type this command to ignore changes to this file:
-#   git update-index --assume-unchanged src/compile_time_constants.pxi
-
 DEF UNAME_SYSNAME = "Windows"
 DEF PY_MAJOR_VERSION = 3
diff --git a/tools/build.py b/tools/build.py
@@ -221,10 +221,7 @@ def check_cython_version():
         print("[build.py] ERROR: Cython is not installed ({0} required)"
               .format(require_version))
         sys.exit(1)
-    if version != require_version:
-        print("[build.py] ERROR: Wrong Cython version: {0}. Required: {1}"
-              .format(version, require_version))
-        sys.exit(1)
+
     print("[build.py] Cython version: {0}".format(version))
 
 
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
@@ -80,7 +80,7 @@
 ALLOW_PARTIAL = False
 
 # Python versions
-SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]
+SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9)]
 
 # Python search paths. It will use first Python found for specific version.
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
@@ -378,7 +378,7 @@ def uninstall_cefpython3_packages(pythons):
                    .format(python=python["executable"]))
         try:
             output = subprocess.check_output(command, shell=True)
-        except subprocess.CalledProcessError, exc:
+        except subprocess.CalledProcessError as exc:
             # pip show returns error code when package is not installed
             output = exc.output
         if not len(output.strip()):
diff --git a/tools/common.py b/tools/common.py
@@ -475,9 +475,11 @@ def get_msvs_for_python(vs_prefix=False):
     elif sys.version_info[:2] == (3, 6):
         return "VS2015" if vs_prefix else "2015"
     elif sys.version_info[:2] == (3, 7):
-        return "VS2015" if vs_prefix else "2015"
+        return "VS2019" if vs_prefix else "2019"
     elif sys.version_info[:2] == (3, 8):
-        return "VS2015" if vs_prefix else "2015"
+        return "VS2019" if vs_prefix else "2019"
+    elif sys.version_info[:2] == (3, 9):
+        return "VS2019" if vs_prefix else "2019"
     else:
         print("ERROR: This version of Python is not supported")
         sys.exit(1)
diff --git a/tools/cython_setup.py b/tools/cython_setup.py
@@ -154,6 +154,7 @@ def get_winsdk_lib():
             ]
         elif ARCH64:
             winsdk_libs = [
+                r"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64",
                 r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64",
                 # Visual Studio 2008 installation
diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
@@ -63,5 +63,8 @@
 elif sys.version_info[:2] == (3, 8):
     # noinspection PyUnresolvedReferences
     from . import cefpython_py38 as cefpython
+elif sys.version_info[:2] == (3, 9):
+    # noinspection PyUnresolvedReferences
+    from . import cefpython_py39 as cefpython
 else:
     raise Exception("Python version not supported: " + sys.version)
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
@@ -149,6 +149,7 @@ def main():
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
+            "Programming Language :: Python :: 3.9",
             "Topic :: Desktop Environment",
             "Topic :: Internet",
             "Topic :: Internet :: WWW/HTTP",
diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -1,4 +1,4 @@
-Cython == 0.29.21
+Cython == 3.0a6
 docopt >= 0.6.2
 setuptools
 wheel

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ def get_winsdk_lib():`
`154`	`154`	`]`
`155`	`155`	`elif ARCH64:`
`156`	`156`	`winsdk_libs = [`
	`157`	`+ r"C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64",`
`157`	`158`	`r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64",`
`158`	`159`	`r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64",`
`159`	`160`	`# Visual Studio 2008 installation`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Cython == 0.29.21`
	`1`	`+Cython == 3.0a6`
`2`	`2`	`docopt >= 0.6.2`
`3`	`3`	`setuptools`
`4`	`4`	`wheel`