diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ef422f..c7b3581 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ SET(CPACK_PACKAGE_VENDOR "Guilhem Lavaux") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENCE_CeCILL_V2") SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "2") -SET(CPACK_PACKAGE_VERSION_PATCH "2${EXTRA_VERSION}") +SET(CPACK_PACKAGE_VERSION_PATCH "3${EXTRA_VERSION}") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CosmoToolbox-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") SET(CPACK_STRIP_FILES "lib/libCosmoTool.so") SET(CPACK_SOURCE_IGNORE_FILES diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index 288df1f..1f026b6 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -1,8 +1,10 @@ python: - - 3.7 - - 3.8 - 3.9 + - 3.8 + - 3.7 numpy: - - 1.11 - 1.19 + +gsl: + - 2.4 diff --git a/conda/meta.yaml b/conda/meta.yaml index 249bebd..a91f788 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,6 +1,6 @@ package: name: cosmotool - version: "1.2.2" + version: "1.2.3" source: git_rev: 03033b6 @@ -8,41 +8,40 @@ source: requirements: build: - - numpy >=1.11 + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - cython # [build_platform != target_platform] + - numpy # [build_platform != target_platform] - {{ compiler('c') }} - {{ compiler('cxx') }} - - python - - setuptools - - cython - - healpy - - numexpr - - cffi - - pyfftw - - gsl - - h5py host: - python + - pip + - numpy + - pkgconfig - numexpr - cython - healpy - cffi - pyfftw - - gsl + - gsl {{ gsl }} - h5py - run: - - numpy - python + - {{ pin_compatible('numpy') }} - healpy - numexpr - cffi - pyfftw - h5py + - {{ pin_compatible('gsl') }} test: imports: - cosmotool + requires: + - pip about: home: https://bitbucket.org/glavaux/cosmotool diff --git a/requirements.txt b/requirements.txt index ef3f5d4..3a4577b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy +numpy<1.19 cffi numexpr pyfftw diff --git a/setup.py b/setup.py index b8c6925..22e07e8 100644 --- a/setup.py +++ b/setup.py @@ -223,7 +223,7 @@ class BuildCMakeExt(build_ext): CosmoTool_extension = CMakeExtension(name="cosmotool") setup(name='cosmotool', - version='1.2.2', + version='1.2.3', packages=["cosmotool"], package_dir={'cosmotool': 'python/cosmotool'}, install_requires=['numpy','cffi','numexpr','pyfftw','h5py'], diff --git a/src/hdf5_array.hpp b/src/hdf5_array.hpp index 9587189..db75a33 100644 --- a/src/hdf5_array.hpp +++ b/src/hdf5_array.hpp @@ -426,7 +426,7 @@ namespace CosmoTool { #define CTOOL_HDF5_INSERT_ELEMENT(r, STRUCT, element) \ { \ ::CosmoTool::get_hdf5_data_type t; \ - position = HOFFSET(STRUCT, BOOST_PP_TUPLE_ELEM(2, 1, element)); \ + long position = HOFFSET(STRUCT, BOOST_PP_TUPLE_ELEM(2, 1, element)); \ const char *field_name = BOOST_PP_STRINGIZE(BOOST_PP_TUPLE_ELEM(2, 1, element)); \ type.insertMember(field_name, position, t.type()); \ } @@ -439,7 +439,6 @@ namespace CosmoTool { \ \ TNAME() : type(sizeof(STRUCT)) \ { \ - long position; \ BOOST_PP_SEQ_FOR_EACH(CTOOL_HDF5_INSERT_ELEMENT, STRUCT, ATTRIBUTES) \ } \ \ @@ -471,7 +470,6 @@ namespace CosmoTool { \ \ TNAME() : type(sizeof(STRUCT)) \ { \ - long position; \ BOOST_PP_SEQ_FOR_EACH(CTOOL_HDF5_INSERT_ENUM_ELEMENT, STRUCT, ATTRIBUTES) \ } \ \