Merge branch 'release/1.6.5'

Bam4d · Jan 2, 2023 · 0f75a59 · 0f75a59
2 parents 8085a94 + d9fb307
commit 0f75a59
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 79 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. mac/linux/windows]
- - Version [e.g. 1.6.4]
+ - Version [e.g. 1.6.5]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.18.0)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
-project(Griddly VERSION 1.6.4)
+project(Griddly VERSION 1.6.5)
 
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)
 
@@ -118,8 +118,6 @@ enable_sanitizers(project_options)
 # allow for static analysis
 include(${CMAKE_CONFIG_FOLDER}/settings/StaticAnalyzers.cmake)
 
-include(${CMAKE_CONFIG_FOLDER}/settings/Conan.cmake)
-
 # glm
 find_package(glm REQUIRED)
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -268,8 +268,9 @@ jobs:
         displayName: Install Conan
       - bash: |
           set -ex
-          cmake . -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR:STRING="$(py.pythonLocation)"
-          cmake --build . --target python_griddly --config Release
+          conan install deps/conanfile.txt --profile default --profile deps/build.profile -s build_type=Release --build missing -if build
+          cmake . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DPython_ROOT_DIR:STRING="$(py.pythonLocation)"
+          cmake --build build --config Release
         displayName: Build
       - script: |
           cd python
@@ -382,8 +383,9 @@ jobs:
         displayName: Install Conan
       - bash: |
           set -ex
-          cmake . -DCMAKE_BUILD_TYPE=Release -DPython_ROOT_DIR:STRING=$(py.pythonLocation)
-          cmake --build . --config Release
+          conan install deps/conanfile.txt --profile default --profile deps/build.profile -s build_type=Release --build missing -if build
+          cmake . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DPython_ROOT_DIR:STRING="$(py.pythonLocation)"
+          cmake --build build --config Release
         displayName: Build
       - script: |
           cd python

diff --git a/bindings/python.cpp b/bindings/python.cpp
@@ -12,7 +12,7 @@ namespace griddly {
 
 PYBIND11_MODULE(python_griddly, m) {
   m.doc() = "Griddly python bindings";
-  m.attr("version") = "1.6.4";
+  m.attr("version") = "1.6.5";
 
 #ifndef NDEBUG
   spdlog::set_level(spdlog::level::debug);

diff --git a/cmake/settings/Conan.cmake b/cmake/settings/Conan.cmake
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'Chris Bamford'
 
 # The full version, including alpha/beta/rc tags
-release = '1.6.4'
+release = '1.6.5'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/js/griddlyjs-app/package-lock.json b/js/griddlyjs-app/package-lock.json
diff --git a/js/griddlyjs-app/package.json b/js/griddlyjs-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "griddlyjs-app",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.1.1",

diff --git a/python/manylinux/build-wheels.sh b/python/manylinux/build-wheels.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 set -o pipefail
 
 
@@ -19,7 +19,8 @@ echo "Conan Build Finished"
 
 # # Cmake Build Griddly
 cd /opt/Griddly
-/opt/python/$PYBIN/bin/cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DMANYLINUX=ON -DPython_ROOT_DIR:STRING=/opt/python/$PYBIN -DPYTHON_EXECUTABLE:FILEPATH=/opt/python/$PYBIN/bin/python -S /opt/Griddly -B /opt/Griddly/build_manylinux
+conan install deps/conanfile.txt --profile default --profile deps/build.profile -s build_type=Release --build=* -if build_manylinux
+/opt/python/$PYBIN/bin/cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DPython_ROOT_DIR:STRING=/opt/python/$PYBIN -DPYTHON_EXECUTABLE:FILEPATH=/opt/python/$PYBIN/bin/python -S /opt/Griddly -B /opt/Griddly/build_manylinux
 /opt/python/$PYBIN/bin/cmake --build /opt/Griddly/build_manylinux --target python_griddly
 
 # # # Create Wheel

diff --git a/python/setup.py b/python/setup.py
@@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'):
 
 setup(
     name='griddly',
-    version="1.6.4",
+    version="1.6.5",
     author_email="[email protected]",
     description="Griddly Python Libraries",
     long_description=long_description,