From 368b12c15b45715e5aea78cfac51cf2c72f79b7d Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 24 Jul 2024 14:08:43 +0200 Subject: [PATCH 1/5] minor release (typos) to test the pypi deploy --- CMakeLists.txt | 4 ++-- ChangeLog.md | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db499ff962..271b8d1638 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/deps) set(DGtal_VERSION_MAJOR 1) -set(DGtal_VERSION_MINOR 5) -set(DGtal_VERSION_PATCH beta) +set(DGtal_VERSION_MINOR 4) +set(DGtal_VERSION_PATCH 1) set(DGTAL_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}") set(PROJECT_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}") set(VERSION ${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}) diff --git a/ChangeLog.md b/ChangeLog.md index f6489c2df1..5c0425662e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,4 +1,4 @@ -# DGtal 1.5beta +# DGtal 1.4.1 ## New features / critical changes @@ -8,7 +8,6 @@ [#1738](https://github.com/DGtal-team/DGtal/pull/1738)) ## Bug fixes - - *General* - Fixing typos int the cmake script (David Coeurjolly, [#1739](https://github.com/DGtal-team/DGtal/pull/1739)) From c8c770b56a671c519000ea4d469bef3c1f4c0ad9 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 24 Jul 2024 14:21:11 +0200 Subject: [PATCH 2/5] Fixing github actions --- .github/workflows/pythonBindings-PR.yml | 10 +++++----- .github/workflows/pythonBindings-Pypi.yml | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pythonBindings-PR.yml b/.github/workflows/pythonBindings-PR.yml index 4aa44b021c..81c5f68d54 100644 --- a/.github/workflows/pythonBindings-PR.yml +++ b/.github/workflows/pythonBindings-PR.yml @@ -33,28 +33,28 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Installing dependancies (Linux) + - name: Installing dependencies (Linux) if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libcgal-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libfftw3-dev libinsighttoolkit4-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev - - name: Installing dependancies (macOS) + - name: Installing dependencies (macOS) if: matrix.os == 'macOS-latest' run: brew install boost ninja gmp libomp ccache cgal - - name: Install dependancies (conan - Windows 1/2) + - name: Install dependencies (conan - Windows 1/2) if: matrix.os == 'windows-latest' id: conan uses: turtlebrowser/get-conan@main with: version: 2.4.0 - - name: Install dependancies (conan - Windows 2/2) + - name: Install dependencies (conan - Windows 2/2) if: matrix.os == 'windows-latest' run: | conan profile detect --force - + - uses: actions/cache@v3 if: matrix.os == 'windows-latest' with: diff --git a/.github/workflows/pythonBindings-Pypi.yml b/.github/workflows/pythonBindings-Pypi.yml index f4eeade3dd..305de2c995 100644 --- a/.github/workflows/pythonBindings-Pypi.yml +++ b/.github/workflows/pythonBindings-Pypi.yml @@ -12,7 +12,7 @@ env: CONFIG_GLOBAL: CONFIG_LINUX: CONFIG_MAC: - CONFIG_WINDOWS: + CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" jobs: build: @@ -36,24 +36,24 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Installing dependancies (Linux) + - name: Installing dependencies (Linux) if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install zsh libqglviewer-dev-qt5 libboost-dev libcgal-dev ninja-build libhdf5-serial-dev libboost-dev libcairo2-dev libgmp-dev libfftw3-dev libinsighttoolkit4-dev xorg-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev - - name: Installing dependancies (macOS) + - name: Installing dependencies (macOS) if: matrix.os == 'macOS-latest' run: brew install boost ninja gmp libomp ccache cgal - - name: Install dependancies (conan - Windows 1/2) + - name: Install dependencies (conan - Windows 1/2) if: matrix.os == 'windows-latest' id: conan uses: turtlebrowser/get-conan@main with: version: 2.4.0 - - name: Install dependancies (conan - Windows 2/2) + - name: Install dependencies (conan - Windows 2/2) if: matrix.os == 'windows-latest' run: | conan profile detect --force @@ -94,6 +94,7 @@ jobs: working-directory: ${{runner.workspace}}/build run: | conan install $GITHUB_WORKSPACE --build=missing + cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS - name: Setting build informations (Windows) if: matrix.os == 'windows-latest' From 96282d97d2c27422ad781d18b080f21347a5f450 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 24 Jul 2024 14:31:30 +0200 Subject: [PATCH 3/5] Fixing deploy pypi on windows --- .github/workflows/pythonBindings-Pypi.yml | 5 ++--- wrap/deploy/setup.py | 8 +++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pythonBindings-Pypi.yml b/.github/workflows/pythonBindings-Pypi.yml index 305de2c995..3c84296ca4 100644 --- a/.github/workflows/pythonBindings-Pypi.yml +++ b/.github/workflows/pythonBindings-Pypi.yml @@ -91,11 +91,10 @@ jobs: - name: Deps on Windows if: matrix.os == 'windows-latest' shell: bash - working-directory: ${{runner.workspace}}/build + working-directory: ${{runner.workspace}} run: | conan install $GITHUB_WORKSPACE --build=missing - cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS - + - name: Setting build informations (Windows) if: matrix.os == 'windows-latest' shell: bash diff --git a/wrap/deploy/setup.py b/wrap/deploy/setup.py index 79964abfab..049c0ab56f 100644 --- a/wrap/deploy/setup.py +++ b/wrap/deploy/setup.py @@ -23,7 +23,13 @@ '-DDGTAL_WRAP_PYTHON:BOOL=ON' ] if sys.platform == "win32": - CMAKE_OPTIONS.append("-DENABLE_CONAN:BOOL=ON") + CMAKE_OPTIONS.append("-DENABLE_CONAN:BOOL=ON ") + CMAKE_OPTIONS.append(" -DENABLE_CONAN=true") + CMAKE_OPTIONS.append("-DCMAKE_C_COMPILER=\"cl.exe\"") + CMAKE_OPTIONS.append("-DCMAKE_CXX_COMPILER=\"cl.exe\"") + CMAKE_OPTIONS.append("-DCMAKE_TOOLCHAIN_FILE=\"conan_toolchain.cmake\"") + CMAKE_OPTIONS.append("-DCMAKE_POLICY_DEFAULT_CMP0091=NEW") + # this_directory = path.abspath(path.dirname(__file__)) From a148cb43a659787b2cb8e662ab871a2f202290b3 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 24 Jul 2024 14:39:01 +0200 Subject: [PATCH 4/5] removing pypi windows --- .github/workflows/pythonBindings-Pypi.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonBindings-Pypi.yml b/.github/workflows/pythonBindings-Pypi.yml index 3c84296ca4..e667dbbb58 100644 --- a/.github/workflows/pythonBindings-Pypi.yml +++ b/.github/workflows/pythonBindings-Pypi.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macOS-latest] python-version: ["3.9", "3.10", "3.11"] BUILD_TYPE: [Release] @@ -88,12 +88,16 @@ jobs: sed -i '' "1s/.*/VERSION = '${{ github.ref_name }}'/" dgtalVersion.py cat dgtalVersion.py + - name: Create Build Environment + run: cmake -E make_directory ${{runner.workspace}}/build + - name: Deps on Windows if: matrix.os == 'windows-latest' shell: bash - working-directory: ${{runner.workspace}} + working-directory: ${{runner.workspace}}/build run: | conan install $GITHUB_WORKSPACE --build=missing + cmake $GITHUB_WORKSPACE -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} $CONFIG_PYTHON $CONFIG_GLOBAL $CONFIG_WINDOWS - name: Setting build informations (Windows) if: matrix.os == 'windows-latest' From c159d34b58c27af58a0987b6dbedcf2bb09f37cd Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 24 Jul 2024 14:40:59 +0200 Subject: [PATCH 5/5] back to 1.5beta version on master --- CMakeLists.txt | 4 ++-- ChangeLog.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 271b8d1638..db499ff962 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/deps) set(DGtal_VERSION_MAJOR 1) -set(DGtal_VERSION_MINOR 4) -set(DGtal_VERSION_PATCH 1) +set(DGtal_VERSION_MINOR 5) +set(DGtal_VERSION_PATCH beta) set(DGTAL_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}") set(PROJECT_VERSION "${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}") set(VERSION ${DGtal_VERSION_MAJOR}.${DGtal_VERSION_MINOR}.${DGtal_VERSION_PATCH}) diff --git a/ChangeLog.md b/ChangeLog.md index 5c0425662e..6258eee55d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +# DGtal 1.5beta + + # DGtal 1.4.1 ## New features / critical changes