From 446fa2d11346e9c53f7eac004cfea8ee352a8d4b Mon Sep 17 00:00:00 2001 From: Markus Otto Date: Thu, 27 Jun 2019 21:47:17 +0200 Subject: [PATCH 1/2] require python3.6 --- CMakeLists.txt | 2 +- buildsystem/simple | 4 ++-- configure | 4 ++-- doc/building.md | 2 +- openage/__init__.py | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1520425a2..16255a0080 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # Python and Cython requirements -set(PYTHON_MIN_VERSION 3.4) +set(PYTHON_MIN_VERSION 3.6) set(CYTHON_MIN_VERSION 0.25) # CMake policies diff --git a/buildsystem/simple b/buildsystem/simple index 6e9934026e..b7c9d37640 100755 --- a/buildsystem/simple +++ b/buildsystem/simple @@ -12,8 +12,8 @@ # this script was written by carefully looking at the output of make VERBOSE=1. # if you add libraries/etc to the project, please update this script accordingly (and test it). -PYVER=3.4m -PYVERDOTLESS=34m +PYVER=3.6m +PYVERDOTLESS=36m shopt -s globstar function run() { diff --git a/configure b/configure index e68479b882..28a046b226 100755 --- a/configure +++ b/configure @@ -16,8 +16,8 @@ import shutil import subprocess import sys -if sys.version_info < (3, 4): - print("openage requires Python 3.4 or higher") +if sys.version_info < (3, 6): + print("openage requires Python 3.6 or higher") exit(1) diff --git a/doc/building.md b/doc/building.md index fe3024e718..9f4342bf5f 100644 --- a/doc/building.md +++ b/doc/building.md @@ -28,7 +28,7 @@ Dependencies are needed for: Dependency list: C gcc >=7 or clang >=5 - CRA python >=3.4 + CRA python >=3.6 C cython >=0.25 C cmake >=3.8.0 A numpy diff --git a/openage/__init__.py b/openage/__init__.py index 2d8b03b805..812761cb6e 100644 --- a/openage/__init__.py +++ b/openage/__init__.py @@ -6,15 +6,15 @@ See https://openage.sft.mx and http://github.com/sfttech/openage. -Requires Python 3.4. +Requires Python 3.6. """ from sys import version_info as py_version from .log import setup_logging -if py_version < (3, 4): - raise Exception("openage requires python 3.4 or higher.") +if py_version < (3, 6): + raise Exception("openage requires python 3.6 or higher.") try: From 3c9c245a68ec75a29bfe3e94e7f6e4a93ac7da21 Mon Sep 17 00:00:00 2001 From: Markus Otto Date: Thu, 27 Jun 2019 21:52:56 +0200 Subject: [PATCH 2/2] bump version to 0.4.0 --- openage_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openage_version b/openage_version index 937cd78462..fb7a04cff8 100644 --- a/openage_version +++ b/openage_version @@ -1 +1 @@ -v0.3.1 +v0.4.0