Merge pull request #52 from astro-informatics/pin-cmake

Pin cmake version
astro-informatics · Aug 20, 2023 · afcf27b · afcf27b
2 parents 4ec09b8 + 0ca8957
commit afcf27b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -92,14 +92,14 @@ jobs:
             mv source-distribution/*.tar.gz  wheel-*/*.whl dist
 
       - name: Publish distribution 📦 to Test PyPI
-        if: ${{ github.ref != 'refs/tags/v2.2.5' }}
+        if: ${{ github.ref != 'refs/tags/v2.2.6' }}
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.TEST_PYPI_TOKEN }}
           repository_url: https://test.pypi.org/legacy/
 
       - name: Publish distribution 📦 to PyPI
-        if: ${{ github.ref == 'refs/tags/v2.2.5' }}
+        if: ${{ github.ref == 'refs/tags/v2.2.6' }}
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,4 @@ dist/
 MANIFEST
 .clangd/
 compile_commands.json
+/_skbuild/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
-cmake_minimum_required(VERSION 3.12...4.0)
+cmake_minimum_required(VERSION 3.12...3.26)
 
 project(
   s2let
-  VERSION "2.2.5"
+  VERSION "2.2.6"
   DESCRIPTION "Fast wavelets on the sphere"
   HOMEPAGE_URL "http://astro-informatics.github.io/s2let/"
   LANGUAGES C)

diff --git a/makefile b/makefile
@@ -27,7 +27,7 @@ UNAME 	:= $(shell uname)
 
 # Compilers and options for C
 CC	= gcc
-OPT	= -Wall -g -fPIC -fopenmp -DS2LET_VERSION=\"2.2.5\" -DS2LET_BUILD=\"`git rev-parse HEAD`\"
+OPT	= -Wall -g -fPIC -fopenmp -DS2LET_VERSION=\"2.2.6\" -DS2LET_BUILD=\"`git rev-parse HEAD`\"
 
 # Compilers and options for Fortran
 FCC	= gfortran

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.5
+current_version = 2.2.6
 commit = False
 tag = False
 

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
 
 setup(
     name="pys2let",
-    version="2.2.5",
+    version="2.2.6",
     author=["Boris Leistedt", "Martin Büttner", "Jennifer Chan", "Jason McEwen"],
     install_requires=["numpy"],
     extras_require={

diff --git a/src/doxygen.config b/src/doxygen.config
@@ -31,7 +31,7 @@ PROJECT_NAME           = S2LET
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.2.5
+PROJECT_NUMBER         = 2.2.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer