Skip to content

Commit 55e6360

Browse files
authored
Add support for Python 3.8 and Upgrade Cython (#594)
Fixes: #546 Had to include harfbuzz manually as newer Pango change this. See: eiskaltdcpp/eiskaltdcpp#413 https://gitlab.gnome.org/GNOME/pango/-/issues/387 Also had to add `-Wno-deprecated-declarations` to get this to compile because of the following errors that didn't seem to be coming from this code directly: warning: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead warning: ‘GTypeDebugFlags’ is deprecated
1 parent 8e36e82 commit 55e6360

File tree

8 files changed

+14
-6
lines changed

8 files changed

+14
-6
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ support old operating systems then choose the v31 release.
210210

211211
OS | Py2 | Py3 | 32bit | 64bit | Requirements
212212
--- | --- | --- | --- | --- | ---
213-
Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+
214-
Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,<br> Fedora 24+, openSUSE 13.3+
215-
Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+
213+
Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Windows 7+
214+
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+
215+
Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | No | Yes | MacOS 10.9+
216216

217217
These platforms are not supported yet:
218218
- ARM - see [Issue #267](../../issues/267)

src/common/cefpython_public_api.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
#include "../../build/build_cefpython/cefpython_py36_fixed.h"
4747
#elif PY_MINOR_VERSION == 7
4848
#include "../../build/build_cefpython/cefpython_py37_fixed.h"
49+
#elif PY_MINOR_VERSION == 8
50+
#include "../../build/build_cefpython/cefpython_py38_fixed.h"
4951
#endif // PY_MINOR_VERSION
5052
#endif // PY_MAJOR_VERSION
5153

tools/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ def setup_environ():
293293
print("[build.py] PYTHON_INCLUDE: {python_include}"
294294
.format(python_include=os.environ["PYTHON_INCLUDE"]))
295295

296-
os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror"
296+
os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror -Wno-deprecated-declarations"
297297
if FAST_FLAG:
298298
os.environ["CEF_CCFLAGS"] += " -O0"
299299
else:

tools/build_distrib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
ALLOW_PARTIAL = False
8181

8282
# Python versions
83-
SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7)]
83+
SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]
8484

8585
# Python search paths. It will use first Python found for specific version.
8686
# Supports replacement of one environment variable in path eg.: %ENV_KEY%.

tools/common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,8 @@ def get_msvs_for_python(vs_prefix=False):
473473
return "VS2015" if vs_prefix else "2015"
474474
elif sys.version_info[:2] == (3, 7):
475475
return "VS2015" if vs_prefix else "2015"
476+
elif sys.version_info[:2] == (3, 8):
477+
return "VS2015" if vs_prefix else "2015"
476478
else:
477479
print("ERROR: This version of Python is not supported")
478480
sys.exit(1)

tools/installer/cefpython3.__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,8 @@
6464
elif sys.version_info[:2] == (3, 7):
6565
# noinspection PyUnresolvedReferences
6666
from . import cefpython_py37 as cefpython
67+
elif sys.version_info[:2] == (3, 8):
68+
# noinspection PyUnresolvedReferences
69+
from . import cefpython_py38 as cefpython
6770
else:
6871
raise Exception("Python version not supported: " + sys.version)

tools/installer/cefpython3.setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ def main():
148148
"Programming Language :: Python :: 3.5",
149149
"Programming Language :: Python :: 3.6",
150150
"Programming Language :: Python :: 3.7",
151+
"Programming Language :: Python :: 3.8",
151152
"Topic :: Desktop Environment",
152153
"Topic :: Internet",
153154
"Topic :: Internet :: WWW/HTTP",

tools/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Cython == 0.28.4
1+
Cython == 0.29.21
22
docopt >= 0.6.2
33
setuptools
44
wheel

0 commit comments

Comments
 (0)