Skip to content

Commit bbb4f1c

Browse files
committed
Setting up for moving from bintray to conan-center
- bump to v2.2.3 - remove sanitizers (should use https://docs.conan.io/en/1.18/howtos/sanitizers.html#compiler-sanitizers) - remove old conan stuff that will be in conan-center - update export stuff - update readme and index to point to conan-center
1 parent e0420c0 commit bbb4f1c

21 files changed

+637
-620
lines changed

.github/workflows/conan.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/workflows/python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ jobs:
119119
mv source-distribution/*.tar.gz wheel-*/*.whl dist
120120
121121
- name: Publish distribution 📦 to Test PyPI
122-
if: ${{ github.ref != 'refs/tags/v2.2.2' }}
122+
if: ${{ github.ref != 'refs/tags/v2.2.3' }}
123123
uses: pypa/gh-action-pypi-publish@master
124124
with:
125125
password: ${{ secrets.TEST_PYPI_TOKEN }}
126126
repository_url: https://test.pypi.org/legacy/
127127

128128
- name: Publish distribution 📦 to PyPI
129-
if: ${{ github.ref == 'refs/tags/v2.2.2' }}
129+
if: ${{ github.ref == 'refs/tags/v2.2.3' }}
130130
uses: pypa/gh-action-pypi-publish@master
131131
with:
132132
password: ${{ secrets.PYPI_TOKEN }}

CMakeLists.txt

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,57 @@
1-
cmake_minimum_required(VERSION 3.12)
1+
cmake_minimum_required(VERSION 3.12...4.0)
22

33
project(
44
s2let
5-
VERSION "2.2.2"
5+
VERSION "2.2.3"
66
DESCRIPTION "Fast wavelets on the sphere"
77
HOMEPAGE_URL "http://astro-informatics.github.io/s2let/"
88
LANGUAGES C)
99

10-
option(tests "Enable testing" ON)
1110
option(cfitsio "Links to cfitsio" OFF)
12-
option(fPIC "Compile with fPIC" ON)
1311
option(conan_deps "Download dependencies using conan" OFF)
1412

15-
if(WIN32)
16-
set(fpic OFF)
13+
if(conan_deps AND NOT cfitsio)
14+
message(
15+
WARNING "cfitsio is always included when managing dependencies via conan")
1716
endif()
17+
1818
if(NOT CMAKE_BUILD_TYPE)
1919
set(CMAKE_BUILD_TYPE "Debug")
2020
endif()
2121

22-
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
23-
include("sanitizers")
22+
include(CTest)
2423
if(conan_deps OR CONAN_EDITABLE_MODE)
25-
include("conan_dependencies")
26-
if(NOT CONAN_EDITABLE_MODE)
27-
set(SO3_TARGET CONAN_PKG::so3)
28-
endif()
29-
if(cfitsio)
30-
set(CFITSIO_TARGET CONAN_PKG::cfitsio)
31-
endif()
24+
include("${PROJECT_SOURCE_DIR}/cmake/conan_dependencies.cmake")
3225
endif()
33-
if(NOT conan_deps)
34-
find_package(So3 REQUIRED)
35-
set(SO3_TARGET so3)
36-
if(cfitsio AND NOT CONAN_EDITABLE_MODE)
37-
find_package(CFITSIO REQUIRED)
38-
set(CFITSIO_TARGET cfitsio::cfitsio)
39-
endif()
26+
if(EXISTS "${PROJECT_BINARY_DIR}/conan_paths.cmake")
27+
include("${PROJECT_BINARY_DIR}/conan_paths.cmake")
28+
elseif(EXISTS "${PROJECT_BINARY_DIR}/FindFFTW3.cmake")
29+
list(APPEND CMAKE_MODULE_PATH "${PROJECT_BINARY_DIR}")
30+
else()
31+
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
32+
endif()
33+
34+
find_package(astro-informatics-so3 REQUIRED)
35+
find_library(MATH_LIBRARY m)
36+
if(cfitsio)
37+
find_package(cfitsio REQUIRED)
4038
endif()
4139

4240
add_subdirectory(src/main/c)
4341

44-
if(tests)
45-
enable_testing()
46-
include("fetch_cmocka")
42+
include(CTest)
43+
if(BUILD_TESTING)
44+
include("${PROJECT_SOURCE_DIR}/cmake/fetch_cmocka.cmake")
4745
add_subdirectory(src/test/c)
4846
endif()
4947

50-
if(NOT SKBUILD)
51-
include("exporting")
52-
else()
48+
if(SKBUILD)
5349
find_package(PythonExtensions REQUIRED)
5450
find_package(Cython REQUIRED)
5551
find_package(NumPy REQUIRED)
5652
add_subdirectory(src/main/pys2let)
53+
elseif(NOT CONAN_EXPORTED)
54+
include("${PROJECT_SOURCE_DIR}/cmake/exporting.cmake")
5755
endif()
5856

5957
# only run documentation if this is not a sub-project

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include CMakeLists.txt
22
include setup.py setup.cfg pyproject.toml
33
include COPYRIGHT.txt LICENSE.md README.md
44
include cmake/*.cmake
5+
include conanfile.txt
56
recursive-include src/main/c *.c CMakeLists.txt
67
recursive-include include/s2let *.h
78
recursive-include src/main/pys2let .py *.pyx *.md CMakeLists.txt

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
[docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
44
[docs-url]: https://astro-informatics.github.io/s2let/
5-
[bintray-img]: https://img.shields.io/bintray/v/astro-informatics/astro-informatics/s2let:astro-informatics?label=C%20package
6-
[bintray-url]: https://bintray.com/astro-informatics/astro-informatics/s2let:astro-informatics/2.2.2:stable/link
5+
[conan-img]: https://img.shields.io/badge/ConanCenter-C%20Package-red.svg
6+
[conan-url]: https://conan.io/center/s2let
77
[pypi-img]: https://badge.fury.io/py/pys2let.svg
88
[pypi-url]: https://badge.fury.io/py/pys2let
99
[codefactor-img]: https://www.codefactor.io/repository/github/astro-informatics/s2let/badge/main
1010
[codefactor-url]: https://www.codefactor.io/repository/github/astro-informatics/s2let/overview/main
1111

1212
[![][docs-img]][docs-url]
13-
[![][bintray-img]][bintray-url]
13+
[![][conan-img]][conan-url]
1414
[![][pypi-img]][pypi-url]
1515
![CMake Build](https://github.com/astro-informatics/s2let/workflows/CMake%20Build/badge.svg)
1616
![Python Build](https://github.com/astro-informatics/s2let/workflows/Python%20Build/badge.svg)

0 commit comments

Comments
 (0)