Skip to content

Commit

Permalink
Merge pull request #1135 from zuntrax/version-bump
Browse files Browse the repository at this point in the history
Prepare release 0.4.0
  • Loading branch information
TheJJ authored Jun 27, 2019
2 parents 3bc7954 + 3c9c245 commit 0f8615c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions buildsystem/simple
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion doc/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions openage/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion openage_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.1
v0.4.0

0 comments on commit 0f8615c

Please sign in to comment.