Merge pull request #50 from astro-informatics/feature/conan-center

Feature/conan center

Author: mdavezac

.github/workflows/conan.yml

@@ -66,7 +66,6 @@ jobs:
           path: ./dist/*.tar.gz
           name: source-distribution
 
-
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -115,18 +114,18 @@ jobs:
 
       - name: Move wheels and source distribution to dist/
         run: |
-            mkdir -p dist
-            mv source-distribution/*.tar.gz  wheel-*/*.whl dist
+          mkdir -p dist
+          mv source-distribution/*.tar.gz  wheel-*/*.whl dist
 
       - name: Publish distribution 📦 to Test PyPI
-        if: ${{ github.ref != 'refs/tags/v1.3.5' }}
+        if: ${{ github.ref != 'refs/tags/v1.3.6' }}
         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.3.5' }}
+        if: ${{ github.ref == 'refs/tags/v1.3.6rc1' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/python.yml

@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Python Build",
+            "type": "shell",
+            "command": "direnv exec ${workspaceFolder} python setup.py develop",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}

.vscode/tasks.json

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(
   Ssht
-  VERSION "1.3.5"
+  VERSION "1.3.6"
   DESCRIPTION "Fast and exact spin spherical harmonic transforms"
   HOMEPAGE_URL "http://astro-informatics.github.io/ssht/"
   LANGUAGES C)

CMakeLists.txt

@@ -2,8 +2,8 @@
 
 [docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
 [docs-url]: https://astro-informatics.github.io/ssht/
-[bintray-img]: https://img.shields.io/bintray/v/astro-informatics/astro-informatics/ssht:astro-informatics?label=C%20package
-[bintray-url]: https://bintray.com/astro-informatics/astro-informatics/ssht:astro-informatics/1.3.5:stable/link
+[bintray-img]: https://img.shields.io/badge/ConanCenter-C%20Package-red.svg
+[bintray-url]: https://conan.io/center/ssht
 [pypi-img]: https://badge.fury.io/py/pyssht.svg
 [pypi-url]: https://badge.fury.io/py/pyssht
 [codefactor-img]: https://www.codefactor.io/repository/github/astro-informatics/ssht/badge/main
@@ -25,7 +25,7 @@ sphere derived in <a href="http://www.jasonmcewen.org/publication/mcewen-fssht/"
 
 ## INSTALLATION
 
- The python package, <strong>pyssht</strong>, is available on <a href="https://pypi.org/project/pyssht/">pypi</a> and can be installed with: 
+ The python package, **pyssht**, is available on <a href="https://pypi.org/project/pyssht/">pypi</a> and can be installed with: 
 
  ```bash
  pip install pyssht
@@ -74,7 +74,7 @@ If you use **SSHT** for work that results in publication, please reference <a hr
 ## LICENSE
 
 SSHT is released under the GPL-3 license.  For further details see 
-[LICENSE.txt](https://github.com/astro-informatics/ssht/blob/main/LICENSE).
+[LICENSE](https://github.com/astro-informatics/ssht/blob/main/LICENSE).
 
 
 ## AUTHORS

README.md

@@ -1,8 +1,13 @@
-get_filename_component(Ssht_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-message(STATUS "Linking to ssht package in ${Ssht_CMAKE_DIR}")
-if(NOT TARGET ssht AND EXISTS "${Ssht_CMAKE_DIR}/SshtTargets.cmake")
-  include("${Ssht_CMAKE_DIR}/SshtTargets.cmake")
+set(Ssht_VERSION "@PROJECT_VERSION@")
+
+@PACKAGE_INIT@
+
+if(NOT "@conan_deps@" AND NOT "@CONAN_EDITABLE_MODE@")
+  include(CMakeFindDependencyMacro)
+  find_dependency(FFTW3 REQUIRED COMPONENTS SERIAL DOUBLE)
 endif()
 
-set(Ssht_INCLUDE_DIRS "@ALL_INCLUDE_DIRS@")
+set(Ssht_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
 set(Ssht_LIBRARIES ssht)
+
+check_required_components(Ssht)

cmake/SshtConfig.in.cmake

@@ -6,31 +6,24 @@ if(NOT NOEXPORT)
   export(PACKAGE Ssht)
 endif()
 
-# First in binary dir
-set(ALL_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}")
-configure_File(cmake/SshtConfig.in.cmake
-  "${PROJECT_BINARY_DIR}/SshtConfig.cmake" @ONLY
-)
-configure_File(cmake/SshtConfigVersion.in.cmake
-  "${PROJECT_BINARY_DIR}/SshtConfigVersion.cmake" @ONLY
-)
+set(INCLUDE_INSTALL_DIR include/)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(cmake/SshtConfig.in.cmake
+  "${PROJECT_BINARY_DIR}/SshtConfig.cmake"
+  INSTALL_DESTINATION lib/cmake/Ssht
+  PATH_VARS INCLUDE_INSTALL_DIR)
+write_basic_package_version_file(
+  SshtConfigVersion.cmake
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY SameMajorVersion)
 
-# Then for installation tree
-file(RELATIVE_PATH REL_INCLUDE_DIR
-    "${CMAKE_INSTALL_PREFIX}/share/cmake/ssht"
-    "${CMAKE_INSTALL_PREFIX}/include"
-)
-set(ALL_INCLUDE_DIRS "\${Ssht_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-configure_file(cmake/SshtConfig.in.cmake
-  "${PROJECT_BINARY_DIR}/CMakeFiles/SshtConfig.cmake" @ONLY
-)
-
-# Finally install all files
-install(FILES
-  "${PROJECT_BINARY_DIR}/CMakeFiles/SshtConfig.cmake"
-  "${PROJECT_BINARY_DIR}/SshtConfigVersion.cmake"
-    DESTINATION share/cmake/ssht
+if(NOT CONAN_CENTER)
+  install(FILES
+    "${PROJECT_BINARY_DIR}/SshtConfig.cmake"
+    "${PROJECT_BINARY_DIR}/SshtConfigVersion.cmake"
+    DESTINATION lib/cmake/ssht
     COMPONENT dev
-)
+  )
+endif()
 
-install(EXPORT SshtTargets DESTINATION share/cmake/ssht COMPONENT dev)
+install(EXPORT SshtTargets DESTINATION lib/cmake/ssht COMPONENT dev)