From f967db6cad45aae7c34546f4f598476f82c4e663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 26 Jul 2024 12:23:16 +0200 Subject: [PATCH 1/2] Use consistent versioning scheme between C++/Python --- CMakeLists.txt | 2 +- doc/conf.py | 4 ++-- pycolmap/pyproject.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02b5901509..885c3440df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ endif() project(COLMAP LANGUAGES C CXX) -set(COLMAP_VERSION "3.11-dev") +set(COLMAP_VERSION "3.11.0-dev") set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/doc/conf.py b/doc/conf.py index b238c6d554..173a89e000 100755 --- a/doc/conf.py +++ b/doc/conf.py @@ -52,8 +52,8 @@ # |version| and |release|, also used in various other places throughout the # built documents. # -# The short X.Y version. -version = "3.11-dev" +# The short MAJOR.MINOR.PATCH version. +version = "3.11.0-dev" # The full version, including alpha/beta/rc tags. release = version diff --git a/pycolmap/pyproject.toml b/pycolmap/pyproject.toml index b2142eb19e..812dedfc1a 100644 --- a/pycolmap/pyproject.toml +++ b/pycolmap/pyproject.toml @@ -7,7 +7,7 @@ name = "pycolmap" # WARNING: This version must follow the MAJOR.MINOR.PATCH format. If only # MAJOR.MINOR is used, cibuildwheel will add a .dev0 patch version, which # results in releasing a pre-release version on PyPI. -version = "3.11.dev0" +version = "3.11.0.dev0" description = "COLMAP bindings" readme = "README.md" authors = [ From 37239e4712dc51df906ef18f44defa183ccc621a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 26 Jul 2024 12:24:11 +0200 Subject: [PATCH 2/2] d --- CMakeLists.txt | 2 +- doc/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 885c3440df..cc380fa2e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ endif() project(COLMAP LANGUAGES C CXX) -set(COLMAP_VERSION "3.11.0-dev") +set(COLMAP_VERSION "3.11.0.dev0") set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/doc/conf.py b/doc/conf.py index 173a89e000..c89ae4b44f 100755 --- a/doc/conf.py +++ b/doc/conf.py @@ -53,7 +53,7 @@ # built documents. # # The short MAJOR.MINOR.PATCH version. -version = "3.11.0-dev" +version = "3.11.0.dev0" # The full version, including alpha/beta/rc tags. release = version