Next version development

xtensor-stack · Dec 19, 2019 · a742e90 · a742e90
1 parent a8d1fb3
commit a742e90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -94,27 +94,6 @@ matrix:
           packages:
             - g++-7
       env: COMPILER=gcc GCC=7 ENABLE_CPP17=1
-    - os: linux
-      if: branch = master
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
-            - clang-3.6
-      env: COMPILER=clang CLANG=3.6 DISABLE_XSIMD=1
-    - os: linux
-      if: branch = master
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-3.9
-          packages:
-            - g++-4.9
-            - clang-3.9
-      env: COMPILER=clang CLANG=3.9 DISABLE_XSIMD=1
     - os: linux
       if: branch = master
       addons:

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -7,6 +7,15 @@
 Changelog
 =========
 
+0.21.3-dev
+----------
+
+- Allow use of cmake add_subdirectory(xtensor) by checking for xtl target
+  `#1865 <https://github.com/xtensor-stack/xtensor/pull/1865>`_
+- Simplifying CMake config
+  `#1856 <https://github.com/xtensor-stack/xtensor/pull/1856>`_
+
+
 0.21.2
 ------
 

diff --git a/include/xtensor/xtensor_config.hpp b/include/xtensor/xtensor_config.hpp
@@ -12,7 +12,7 @@
 
 #define XTENSOR_VERSION_MAJOR 0
 #define XTENSOR_VERSION_MINOR 21
-#define XTENSOR_VERSION_PATCH 2
+#define XTENSOR_VERSION_PATCH 3-dev
 
 // DETECT 3.6 <= clang < 3.8 for compiler bug workaround.
 #ifdef __clang__