From 3587a9cb7031bd8d8eb7b7f30153cf577466788e Mon Sep 17 00:00:00 2001 From: Bam4d Date: Tue, 11 Jan 2022 14:38:16 +0000 Subject: [PATCH] updating version numbers, licence --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CMakeLists.txt | 2 +- LICENSE | 2 +- azure-pipelines.yml | 6 +++--- bindings/python.cpp | 2 +- docs/conf.py | 2 +- python/setup.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 62543c13c..e0a60a7c4 100644 --- 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.2.23] + - Version [e.g. 1.2.24] **Additional context** Add any other context about the problem here. diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a5fb3b25..5787a3fdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.0) -project(Griddly VERSION 1.2.23) +project(Griddly VERSION 1.2.24) set(BINARY ${CMAKE_PROJECT_NAME}) diff --git a/LICENSE b/LICENSE index a0c45480e..4c561f17f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Chris Bamford +Copyright (c) 2022 Chris Bamford Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a63870618..aacf3c58c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,7 +74,7 @@ jobs: - job: PyPiDeployLinux dependsOn: Linux condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), contains(variables['Build.SourceBranch'], 'test_deploy'))) - timeoutInMinutes: 30 + timeoutInMinutes: 40 pool: vmImage: "ubuntu-18.04" strategy: @@ -133,7 +133,7 @@ jobs: - job: Windows variables: VULKAN_SDK: C:/VulkanSDK/1.2.148.0 - timeoutInMinutes: 30 + timeoutInMinutes: 40 pool: vmImage: "windows-latest" steps: @@ -198,7 +198,7 @@ jobs: dependsOn: Windows variables: VULKAN_SDK: C:/VulkanSDK/1.2.148.0 - timeoutInMinutes: 30 + timeoutInMinutes: 40 pool: vmImage: "windows-latest" strategy: diff --git a/bindings/python.cpp b/bindings/python.cpp index 0e85b2f32..26e006950 100644 --- 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.2.23"; + m.attr("version") = "1.2.24"; #ifndef NDEBUG spdlog::set_level(spdlog::level::debug); diff --git a/docs/conf.py b/docs/conf.py index b3106d4a2..ccbc3c56d 100644 --- 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.2.23' +release = '1.2.24' # -- General configuration --------------------------------------------------- diff --git a/python/setup.py b/python/setup.py index c379d3404..a8cc73a8e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'): setup( name='griddly', - version="1.2.23", + version="1.2.24", author_email="chrisbam4d@gmail.com", description="Griddly Python Libraries", long_description=long_description,