Merge pull request #28 from frodofine/release_0.3.0

Release 0.3.0
chopralab · May 29, 2020 · f874857 · f874857
2 parents 56e19f4 + c8e6528
commit f874857
Show file tree

Hide file tree

Showing 32 changed files with 1,033 additions and 795 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: cpp
-dist: xenial
+dist: bionic
 
 branches:
   only:
@@ -9,7 +9,7 @@ branches:
 addons:
   apt:
     packages:
-    - python3.5-dev
+    - python3.6-dev
     - python3-setuptools
     - python3-pip
 
@@ -24,7 +24,7 @@ jobs:
         - BUILD_TYPE: Debug
         - ASYNC: ON
         - BUILD_DOC: ON
-        - PYTHON_EXECUTABLE: /usr/bin/python3.5m
+        - PYTHON_EXECUTABLE: /usr/bin/python3.6m
         - SHARED_LIBS: ON
     - name: linux release static
       os: linux
@@ -33,7 +33,7 @@ jobs:
         - COVERAGE: OFF
         - BUILD_TYPE: Release
         - ASYNC: ON
-        - PYTHON_EXECUTABLE: /usr/bin/python3.5m
+        - PYTHON_EXECUTABLE: /usr/bin/python3.6m
         - SHARED_LIBS: OFF
     - name: linux release static
       os: linux
@@ -42,7 +42,7 @@ jobs:
         - COVERAGE: OFF
         - BUILD_TYPE: Release
         - ASYNC: ON
-        - PYTHON_EXECUTABLE: /usr/bin/python3.5m
+        - PYTHON_EXECUTABLE: /usr/bin/python3.6m
         - SHARED_LIBS: ON
     - name: linux clang
       os: linux
@@ -51,7 +51,7 @@ jobs:
         - COVERAGE: OFF
         - BUILD_TYPE: Release
         - ASYNC: ON
-        - PYTHON_EXECUTABLE: /usr/bin/python3.5m
+        - PYTHON_EXECUTABLE: /usr/bin/python3.6m
         - SHARED_LIBS: ON
     - name: osx clang
       os: osx

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.2)
 
 project(lemon C CXX)
 
-set(LEMON_VERSION 0.2.0)
+set(LEMON_VERSION 0.3.0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 

diff --git a/cmake/InstallChemfiles.cmake b/cmake/InstallChemfiles.cmake
@@ -34,14 +34,14 @@ endif()
 
 ExternalProject_Add(
     CHEMFILES
-    GIT_REPOSITORY https://github.com/chemfiles/chemfiles.git
-    GIT_TAG master
+    GIT_REPOSITORY https://github.com/frodofine/chemfiles.git
+    GIT_TAG merge_for_dubs
     SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/chemfiles_build
     INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/chemfiles_install
     CMAKE_CACHE_ARGS
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
         -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
     EXCLUDE_FROM_ALL TRUE
     BUILD_BYPRODUCTS ${chemfiles_byproduct}

diff --git a/dubs/.gitignore b/dubs/.gitignore
@@ -0,0 +1 @@
+dubs_out/