From 5da3691609731b539e6248ebe090dbbb29eb158f Mon Sep 17 00:00:00 2001 From: Yashas Ambati Date: Thu, 20 Feb 2025 17:28:42 -0500 Subject: [PATCH] Set package name to gtsam-nightly if nightly build --- .github/workflows/build-cibw.yml | 3 +++ CMakeLists.txt | 8 +++++++- python/setup.py.in | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-cibw.yml b/.github/workflows/build-cibw.yml index b42e60731..516cd0f12 100644 --- a/.github/workflows/build-cibw.yml +++ b/.github/workflows/build-cibw.yml @@ -24,6 +24,9 @@ jobs: with: python-version: ${{ matrix.python_version }} + - name: Set Nightly Flag + run: echo "NIGHTLY=1" >> $GITHUB_ENV + - name: Install Dependencies run: | sudo apt-get install -y wget libicu-dev python3-pip python3-setuptools libboost-all-dev ninja-build diff --git a/CMakeLists.txt b/CMakeLists.txt index 262f38121..e2bc9da5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,10 +10,16 @@ set (GTSAM_VERSION_PATCH 0) set (GTSAM_PRERELEASE_VERSION "a0") math (EXPR GTSAM_VERSION_NUMERIC "10000 * ${GTSAM_VERSION_MAJOR} + 100 * ${GTSAM_VERSION_MINOR} + ${GTSAM_VERSION_PATCH}") -if ("${GTSAM_PRERELEASE_VERSION}" STREQUAL "") +if (DEFINED ENV{NIGHTLY}) + string(TIMESTAMP NOW "%Y.%m.%d.%H.%M") + set (GTSAM_VERSION_STRING "${NOW}") + set (SETUP_NAME "gtsam-nightly") +elseif ("${GTSAM_PRERELEASE_VERSION}" STREQUAL "") set (GTSAM_VERSION_STRING "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}.${GTSAM_VERSION_PATCH}") + set (SETUP_NAME "gtsam") else() set (GTSAM_VERSION_STRING "${GTSAM_VERSION_MAJOR}.${GTSAM_VERSION_MINOR}${GTSAM_PRERELEASE_VERSION}") + set (SETUP_NAME "gtsam") endif() project(GTSAM diff --git a/python/setup.py.in b/python/setup.py.in index 4be235ab0..96c21a55e 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -25,7 +25,7 @@ class BinaryDistribution(Distribution): return True setup( - name='gtsam', + name='${SETUP_NAME}', description='Georgia Tech Smoothing And Mapping library', url='https://gtsam.org/', version='${GTSAM_VERSION_STRING}', # https://www.python.org/dev/peps/pep-0440/