diff --git a/.travis.yml b/.travis.yml index 9ec6f927..24c9cde4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,17 @@ branches: jobs: include: + - name: "run test suite with python 3.5" + python: 3.5 - name: "run test suite with python 3.6" python: 3.6 - name: "run test suite with python 3.7" python: 3.7 - name: "run test suite with python 3.8" python: 3.8 + - name: "run test suite with python 3.6 on ARM64" + arch: arm64 + python: 3.5 - name: "run test suite with python 3.6 on ARM64" arch: arm64 python: 3.6 diff --git a/docs/source/conf.py b/docs/source/conf.py index 2a7afb08..967f846e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -20,13 +20,13 @@ # -- Project information ----------------------------------------------------- project = 'kiwisolver' -copyright = '2018, Nucleic team' +copyright = '2018-2020, Nucleic team' author = 'Nucleic team' # The short X.Y version -version = '' +version = '1.2' # The full version, including alpha/beta/rc tags -release = '' +release = '1.2.0' # -- General configuration --------------------------------------------------- diff --git a/kiwi/version.h b/kiwi/version.h index 0c65698e..f6154482 100644 --- a/kiwi/version.h +++ b/kiwi/version.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------- -| Copyright (c) 2013-2019, Nucleic Development Team. +| Copyright (c) 2013-2020, Nucleic Development Team. | | Distributed under the terms of the Modified BSD License. | @@ -10,5 +10,5 @@ #define KIWI_MAJOR_VERSION 1 #define KIWI_MINOR_VERSION 2 #define KIWI_MICRO_VERSION 0 -#define KIWI_VERSION_HEX 0x010001 +#define KIWI_VERSION_HEX 0x010200 #define KIWI_VERSION "1.2.0" diff --git a/py/kiwisolver.cpp b/py/kiwisolver.cpp index 138ae060..d82e67fd 100644 --- a/py/kiwisolver.cpp +++ b/py/kiwisolver.cpp @@ -9,7 +9,7 @@ #include #include "types.h" -#define PY_KIWI_VERSION "1.2.0.dev" +#define PY_KIWI_VERSION "1.2.0" namespace { diff --git a/setup.py b/setup.py index d55dac50..ca0e5cd8 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# Copyright (c) 2013-2017, Nucleic Development Team. +# Copyright (c) 2013-2020, Nucleic Development Team. # # Distributed under the terms of the Modified BSD License. # @@ -58,7 +58,7 @@ def build_extensions(self): setup( name='kiwisolver', - version='1.2.0.dev', + version='1.2.0', author='The Nucleic Development Team', author_email='sccolbert@gmail.com', url='https://github.com/nucleic/kiwi', @@ -72,10 +72,11 @@ def build_extensions(self): 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: Implementation :: CPython', ], python_requires='>=3.5', - setup_requires=['cppy'], + setup_requires=['cppy>=1.2.0'], ext_modules=ext_modules, cmdclass={'build_ext': BuildExt}, )