Skip to content

Add support for Python 3.8 and Upgrade Cython #594

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.

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
merged 1 commit into from
Feb 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,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+,<br> 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+,<br> 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
1 change: 1 addition & 0 deletions src/client_handler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \
-I/usr/include/glib-2.0 \
-I/usr/include/cairo \
-I/usr/include/pango-1.0 \
-I/usr/include/harfbuzz \
-I/usr/include/gdk-pixbuf-2.0 \
-I/usr/include/atk-1.0 \
-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
Expand Down
2 changes: 2 additions & 0 deletions src/common/cefpython_public_api.h
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
2 changes: 1 addition & 1 deletion src/cpp_utils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ OUT = libcpp_utils.a
INC = -I./../ -I/usr/include/gtk-2.0 \
-I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/gtk-2.0/include \
-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \
-I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \
-I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 \
-I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
-I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \
Expand Down
1 change: 1 addition & 0 deletions src/subprocess/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \
-I/usr/include/glib-2.0 \
-I/usr/include/cairo \
-I/usr/include/pango-1.0 \
-I/usr/include/harfbuzz \
-I/usr/include/gdk-pixbuf-2.0 \
-I/usr/include/atk-1.0 \
-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
Expand Down
1 change: 1 addition & 0 deletions src/subprocess/Makefile-libcefpythonapp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \
-I/usr/include/glib-2.0 \
-I/usr/include/cairo \
-I/usr/include/pango-1.0 \
-I/usr/include/harfbuzz \
-I/usr/include/gdk-pixbuf-2.0 \
-I/usr/include/atk-1.0 \
-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \
Expand Down
2 changes: 1 addition & 1 deletion tools/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def setup_environ():
print("[build.py] PYTHON_INCLUDE: {python_include}"
.format(python_include=os.environ["PYTHON_INCLUDE"]))

os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror"
os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror -Wno-deprecated-declarations"
if FAST_FLAG:
os.environ["CEF_CCFLAGS"] += " -O0"
else:
Expand Down
2 changes: 1 addition & 1 deletion tools/build_distrib.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,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
2 changes: 2 additions & 0 deletions tools/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,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 "VS2015" if vs_prefix else "2015"
else:
print("ERROR: This version of Python is not supported")
sys.exit(1)
Expand Down
2 changes: 2 additions & 0 deletions tools/cython_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ def get_include_dirs():
'/usr/include/gtk-unix-print-2.0',
'/usr/include/cairo',
'/usr/include/pango-1.0',
'/usr/include/harfbuzz',
'/usr/include/gdk-pixbuf-2.0',
'/usr/include/atk-1.0',
# Fedora
Expand All @@ -337,6 +338,7 @@ def get_include_dirs():
'/usr/include/gtk-unix-print-2.0',
'/usr/include/cairo',
'/usr/include/pango-1.0',
'/usr/include/harfbuzz',
'/usr/include/gdk-pixbuf-2.0',
'/usr/include/atk-1.0',
# Ubuntu
Expand Down
3 changes: 3 additions & 0 deletions tools/installer/cefpython3.__init__.py
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
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
2 changes: 1 addition & 1 deletion tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cython == 0.28.4
Cython == 0.29.21
docopt >= 0.6.2
setuptools
wheel
Expand Down