Merge pull request #59 from astro-informatics/features/conan-Center

Minor bug update

Author: mdavezac

.github/workflows/python.yml

@@ -118,14 +118,14 @@ jobs:
           mv source-distribution/*.tar.gz  wheel-*/*.whl dist
 
       - name: Publish distribution 📦 to Test PyPI
-        if: ${{ github.ref != 'refs/tags/v1.5.0' }}
+        if: ${{ github.ref != 'refs/tags/v1.5.1' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.TEST_PYPI_TOKEN }}
           repository_url: https://test.pypi.org/legacy/
 
       - name: Publish distribution 📦 to PyPI
-        if: ${{ github.ref == 'refs/tags/v1.5.0' }}
+        if: ${{ github.ref == 'refs/tags/v1.5.1' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_TOKEN }}

CMakeLists.txt

@@ -2,23 +2,17 @@ cmake_minimum_required(VERSION 3.12)
 
 project(
     Ssht
-    VERSION "1.5.0"
+    VERSION "1.5.1"
     DESCRIPTION "Fast and exact spin spherical harmonic transforms"
     HOMEPAGE_URL "http://astro-informatics.github.io/ssht/"
     LANGUAGES C)
 
-option(tests "Enable testing" ON)
 option(conan_deps "Download dependencies using conan" OFF)
-if(NOT WIN32)
-    option(fPIC "Compile with fPIC" ON)
-endif()
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
 endif()
-if(tests)
-    enable_testing()
-endif()
+include(CTest)
 if(conan_deps OR CONAN_EDITABLE_MODE)
     include("${PROJECT_SOURCE_DIR}/cmake/conan_dependencies.cmake")
 endif()
@@ -33,18 +27,18 @@ find_package(FFTW3 REQUIRED)
 find_library(MATH_LIBRARY m)
 
 add_subdirectory(src/c)
-if(tests)
+if(BUILD_TESTING)
     include("${PROJECT_SOURCE_DIR}/cmake/fetch_cmocka.cmake")
     add_subdirectory(tests)
 endif()
 
-if(NOT SKBUILD AND NOT CONAN_EXPORTED)
-    include("${PROJECT_SOURCE_DIR}/cmake/exporting.cmake")
-elseif(NOT CONAN_EXPORTED)
+if(SKBUILD)
     find_package(PythonExtensions REQUIRED)
     find_package(Cython REQUIRED)
     find_package(NumPy REQUIRED)
     add_subdirectory(src/pyssht)
+elseif(NOT CONAN_EXPORTED)
+    include("${PROJECT_SOURCE_DIR}/cmake/exporting.cmake")
 endif()
 
 # only run documentation if this is not a sub-project

cmake/conan_dependencies.cmake

@@ -18,6 +18,6 @@ conan_cmake_install(
     BUILD
     missing
     REMOTE
-    conan-center
+    conancenter
     SETTINGS
     ${settings})

docs/index.html

@@ -51,6 +51,8 @@ <h2>News</h2>
 
       <ul>
 
+        <li><strong>Oct 2021</strong><br />
+          Release of SSHT 1.5.1
         <li><strong>July 2021</strong><br />
           Release of SSHT 1.5.0 (<a href="https://pypi.org/project/ducc0/">ducc0</a> forward adjoint)
         <li><strong>July 2021</strong><br />

makefile

@@ -1,7 +1,7 @@
 # ======== COMPILER ========
 
 CC      = gcc
-OPT		= -std=c99 -pedantic -Wall -O3 -fopenmp -DSSHT_VERSION=\"1.5.0\" -DSSHT_BUILD=\"`git rev-parse HEAD`\"
+OPT		= -std=c99 -pedantic -Wall -O3 -fopenmp -DSSHT_VERSION=\"1.5.1\" -DSSHT_BUILD=\"`git rev-parse HEAD`\"
 #OPT	= -Wall -g -fopenmp -DSSHT_VERSION=\"1.0b1\" -DSSHT_BUILD=\"`git rev-parse HEAD`\"
 
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.0
+current_version = 1.5.1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<rc>\d+))?

setup.py

@@ -3,9 +3,9 @@
 from skbuild import setup
 
 cmake_args = [
-    "-Dtests:BOOL=OFF",
+    "-DBUILD_TESTING:BOOL=OFF",
     "-Dconan_deps=ON",
-    "-DfPIC=ON",
+    "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
 ]
 
 dev_requirements = [
@@ -27,7 +27,7 @@
 
 setup(
     name="pyssht",
-    version="1.5.0",
+    version="1.5.1",
     author=[
         "J. D. McEwen",
         "C. R. G. Wallis",

src/c/CMakeLists.txt

@@ -12,10 +12,6 @@ target_compile_features(ssht PUBLIC c_std_99)
 configure_file(${PROJECT_SOURCE_DIR}/include/ssht/ssht_version.in.h
                ${PROJECT_BINARY_DIR}/include/ssht/ssht_version.h)
 
-if(fPIC)
-    set_target_properties(ssht PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-endif()
-
 if(NOT SKBUILD)
     install(
         TARGETS ssht