Skip to content

Upgrade to Python 3.8 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasMatern merged 3 commits into from
Dec 11, 2020
Merged

Upgrade to Python 3.8 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abdefbc
LF-37520: Added support for Python 3.8. This is based on https://gith…
simon-graham Nov 21, 2020
0e87479
LF-37520: More Python 3.8 support.
simon-graham Nov 22, 2020
cce4e36
LF-37520: Use abspath rather than realpath. This allows the build to …
simon-graham Nov 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ support old operating systems then choose the v31 release.

OS | Py2 | Py3 | 32bit | 64bit | Requirements
--- | --- | --- | --- | --- | ---
Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+
Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+, Fedora 24+, openSUSE 13.3+
Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Windows 7+
Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Debian 8+, Ubuntu 14.04+, Fedora 24+, openSUSE 13.3+
Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | No | Yes | MacOS 10.9+

These platforms are not supported yet:
- ARM - see [Issue #267](../../issues/267)
Expand Down
2 changes: 2 additions & 0 deletions src/common/cefpython_public_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
#include "../../build/build_cefpython/cefpython_py36_fixed.h"
#elif PY_MINOR_VERSION == 7
#include "../../build/build_cefpython/cefpython_py37_fixed.h"
#elif PY_MINOR_VERSION == 8
#include "../../build/build_cefpython/cefpython_py38_fixed.h"
#endif // PY_MINOR_VERSION
#endif // PY_MAJOR_VERSION

Expand Down
10 changes: 5 additions & 5 deletions tools/automate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def setup_options(docopt_args):
if hasattr(Options, key2) and value is not None:
setattr(Options, key2, value)

Options.tools_dir = os.path.dirname(os.path.realpath(__file__))
Options.tools_dir = os.path.dirname(os.path.abspath(__file__))
Copy link
Author

@simon-graham simon-graham Nov 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behaviour of realpath on Windows changed in Python 3.8. When building on a subst-ed drive, it works out the real path on the original drive and folder. This was breaking our subst-ed build_scripts build. Changing to abspath resolves the issue.

Options.cefpython_dir = os.path.dirname(Options.tools_dir)

if not Options.cef_git_url:
Expand Down Expand Up @@ -199,7 +199,7 @@ def setup_options(docopt_args):

# --build-dir
if Options.build_dir:
Options.build_dir = os.path.realpath(Options.build_dir)
Options.build_dir = os.path.abspath(Options.build_dir)
else:
Options.build_dir = os.path.join(Options.cefpython_dir, "build")
if " " in Options.build_dir:
Expand All @@ -211,7 +211,7 @@ def setup_options(docopt_args):

# --cef-build-dir
if Options.cef_build_dir:
Options.cef_build_dir = os.path.realpath(Options.cef_build_dir)
Options.cef_build_dir = os.path.abspath(Options.cef_build_dir)
else:
Options.cef_build_dir = Options.build_dir
if " " in Options.cef_build_dir:
Expand Down Expand Up @@ -714,7 +714,7 @@ def prepare_build_command(build_lib=False, vcvars=None):
command.append(VS_PLATFORM_ARG)
else:
if int(Options.cef_branch) >= 2704:
command.append(VS2015_VCVARS)
command.append(VS2019_VCVARS)
else:
command.append(VS2013_VCVARS)
command.append(VS_PLATFORM_ARG)
Expand Down Expand Up @@ -893,7 +893,7 @@ def copy_app(app):

def get_available_python_compilers():
all_python_compilers = OrderedDict([
("2015", VS2015_VCVARS),
("2019", VS2019_VCVARS),
])
ret_compilers = OrderedDict()
for msvs in all_python_compilers:
Expand Down
4 changes: 2 additions & 2 deletions tools/build_distrib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
ALLOW_PARTIAL = False

# Python versions
SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7)]
SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]

# Python search paths. It will use first Python found for specific version.
# Supports replacement of one environment variable in path eg.: %ENV_KEY%.
Expand Down Expand Up @@ -613,7 +613,7 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons):
return
checked_any = False
for python in all_pythons:
if python["version2"] in ((3, 5), (3, 6), (3, 7)):
if python["version2"] in ((3, 5), (3, 6), (3, 7), (3, 8)):
checked_any = True
if not os.path.exists(os.path.join(setup_dir, "cefpython3",
"msvcp140.dll")):
Expand Down
5 changes: 5 additions & 0 deletions tools/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@

VS_PLATFORM_ARG = "x86" if ARCH32 else "amd64"

VS2019_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio\\2019"
"\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat")

VS2015_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 14.0"
"\\VC\\vcvarsall.bat")

Expand Down Expand Up @@ -477,6 +480,8 @@ def get_msvs_for_python(vs_prefix=False):
return "VS2015" if vs_prefix else "2015"
elif sys.version_info[:2] == (3, 7):
return "VS2015" if vs_prefix else "2015"
elif sys.version_info[:2] == (3, 8):
return "VS2019" if vs_prefix else "2019"
else:
print("ERROR: This version of Python is not supported")
sys.exit(1)
Expand Down
3 changes: 3 additions & 0 deletions tools/installer/cefpython3.__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,8 @@
elif sys.version_info[:2] == (3, 7):
# noinspection PyUnresolvedReferences
from . import cefpython_py37 as cefpython
elif sys.version_info[:2] == (3, 8):
# noinspection PyUnresolvedReferences
from . import cefpython_py38 as cefpython
else:
raise Exception("Python version not supported: " + sys.version)
1 change: 1 addition & 0 deletions tools/installer/cefpython3.setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ def main():
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Topic :: Desktop Environment",
"Topic :: Internet",
"Topic :: Internet :: WWW/HTTP",
Expand Down
3 changes: 2 additions & 1 deletion tools/make_installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,8 @@ def copy_cpp_extension_dependencies_issue359(pkg_dir):
# Python 3.5 / 3.6 / 3.7
if os.path.exists(os.path.join(pkg_dir, "cefpython_py35.pyd")) \
or os.path.exists(os.path.join(pkg_dir, "cefpython_py36.pyd")) \
or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")):
or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")) \
or os.path.exists(os.path.join(pkg_dir, "cefpython_py38.pyd")):
search_paths = [
# This is where Microsoft Visual C++ 2015 Update 3 installs
# (14.00.24212).
Expand Down