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

Conan remote is conancenter and sundries

Author: mdavezac

.github/workflows/python.yml

@@ -119,14 +119,14 @@ jobs:
             mv source-distribution/*.tar.gz  wheel-*/*.whl dist
 
       - name: Publish distribution 📦 to Test PyPI
-        if: ${{ github.ref != 'refs/tags/v1.3.4' }}
+        if: ${{ github.ref != 'refs/tags/v1.3.5' }}
         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.4' }}
+        if: ${{ github.ref == 'refs/tags/v1.3.5' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_TOKEN }}

CMakeLists.txt

@@ -1,16 +1,12 @@
 cmake_minimum_required(VERSION 3.12)
 project(
   so3
-  VERSION "1.3.4"
+  VERSION "1.3.5"
   DESCRIPTION "Fast and exact Wigner transforms"
   HOMEPAGE_URL "http://astro-informatics.github.io/so3/"
   LANGUAGES C)
 
 option(conan_deps "Download ssht using conan" ON)
-if(conan_deps AND download_ssht)
-  message(
-    FATAL_ERROR "conan_deps and download_ssht options are mutually exclusive.")
-endif()
 
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Debug")
@@ -40,13 +36,13 @@ if(BUILD_TESTING)
   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/so3)
+elseif(NOT CONAN_EXPORTED)
+  include("${PROJECT_SOURCE_DIR}/cmake/exporting.cmake")
 endif()
 
 # only run documentation if this is not a sub-project

README.md

@@ -2,7 +2,7 @@
 [docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
 [docs-url]: http://astro-informatics.github.io/so3/
 [conan-img]: https://img.shields.io/badge/ConanCenter-C%20Package-red.svg
-[conan-url]: https://conan.io/center/so3
+[conan-url]: https://conan.io/center/astro-informatics-so3
 [pypi-img]: https://badge.fury.io/py/so3.svg
 [pypi-url]: https://badge.fury.io/py/so3
 [codefactor-img]: https://www.codefactor.io/repository/github/astro-informatics/so3/badge/main

cmake/conan_dependencies.cmake

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

cmake/so3Config.in.cmake

@@ -6,7 +6,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(FFTW3 REQUIRED)
 find_dependency(Ssht REQUIRED)
 
-include("${CMAKE_CURRENT_LIST_DIR}/sshtTargets.cmake")
-set(SO3_LIBRARIES so3::so3)
+include("${CMAKE_CURRENT_LIST_DIR}/astro-informatics-so3Targets.cmake")
+set(SO3_LIBRARIES astro-informatics-so3::astro-informatics-so3)
 
 check_required_components(SO3)

docs/index.html

@@ -47,8 +47,10 @@ <h1 class="title">so3</h1>
       <h2>News</h2>
 
       <ul>
-        <li><strong>April 2021</strong><br />
-          Release of SO3 v1.3.3 (<a href="https://conan.io/center/so3">conan-center</a>release)
+        <li><strong>Oct 2021</strong><br />
+          Release of SO3 v1.3.5
+        <li><strong>May 2021</strong><br />
+          Release of SO3 v1.3.4 (<a href="https://conan.io/center/astro-informatics-so3">conan-center</a>release)
         <li><strong>October 2020</strong><br />
           Release of SO3 v1.3.0
         <li><strong>September 2020</strong><br />
@@ -78,7 +80,7 @@ <h2>News</h2>
           <img src="https://img.shields.io/badge/docs-stable-blue.svg">
         </a>
 
-        <a href="https://conan.io/center/so3">
+        <a href="https://conan.io/center/astro-informatics-so3">
           <img src="https://img.shields.io/badge/ConanCenter-C%20Package-red.svg">
         </a>
 

makefile

@@ -4,7 +4,7 @@
 CC	= gcc
 
 #OPT	= -Wall -O3 -fopenmp -DSO3_VERSION=\"0.1\" -DSO3_BUILD=\"`git rev-parse HEAD`\"
-OPT	= -Wall -g -fopenmp -DSO3_VERSION=\"1.3.4\" -DSO3_BUILD=\"`git rev-parse HEAD`\"
+OPT	= -Wall -g -fopenmp -DSO3_VERSION=\"1.3.5\" -DSO3_BUILD=\"`git rev-parse HEAD`\"
 
 
 # ======== LINKS ========

setup.cfg

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

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name="so3",
-    version="1.3.4",
+    version="1.3.5",
     author="Jason McEwen",
     install_requires=["numpy", "scipy"],
     extras_require={