python-casacore 3.7.1__tar.gz → 3.8.1__tar.gz

{python_casacore-3.7.1 → python_casacore-3.8.1}/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 3.8.1
+
+This version as a binary wheel ships with underlying casacore v3.8.1.
+
+Support for Python 3.8 and 3.9 was dropped; support for Python 3.14 was added.
+This version requires a C++-20 compatible compiler.
+
 # 3.7.1
 
 This version as a binary wheel ships with underlying casacore v3.7.1.

{python_casacore-3.7.1 → python_casacore-3.8.1}/CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.15...3.26)
 project(python-casacore)
 
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
 find_package(
   Python
   COMPONENTS Interpreter Development.Module

{python_casacore-3.7.1 → python_casacore-3.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: python-casacore
-Version: 3.7.1
+Version: 3.8.1
 Summary: A wrapper around CASACORE, the radio astronomy library
 Keywords: pyrap,casacore,utilities,astronomy
 Author-Email: Malte Marquarding <Malte.Marquarding@gmail.com>, Ger van Diepen <gervandiepen@gmail.com>, Gijs Molenaar <gijs@pythonic.nl>, Tammo Jan Dijkema <dijkema@astron.nl>, Marcel Loose <loose@astron.nl>
@@ -179,7 +179,7 @@ Classifier: Programming Language :: C++
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Project-URL: Homepage, https://github.com/casacore/python-casacore
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Requires-Dist: numpy
 Description-Content-Type: text/x-rst
 
@@ -247,17 +247,11 @@ On ubuntu you can install these with::
 
     $ pip install .
 
-* If the compilation fails you might need to help the compiler find the paths to the
-  boost and casacore libraries and headers. You can control this with the `CFLAGS` environment
-  variable. For example on OS X when using homebrew and clang you need to do something like
-  this::
+* If the compilation fails you might need to help the compiler find the paths
+  to the boost and casacore libraries and headers. You can control this with
+  the `CMAKE_ARGS` environment variable. For example::
 
-    CFLAGS="-std=c++11 \
-            -I/usr/local/Cellar/boost/1.68.0/include/ \
-            -I/usr/local/include/  \
-            -L/usr/local/Cellar/boost/1.68.0/lib \
-            -L/usr/local/lib/" \
-            pip install python-casacore
+    $ CMAKE_ARGS="-DCASACORE_ROOT_DIR=/path/to/casacore" pip install .
 
 Support
 =======

{python_casacore-3.7.1 → python_casacore-3.8.1}/README.rst

@@ -62,17 +62,11 @@ On ubuntu you can install these with::
 
     $ pip install .
 
-* If the compilation fails you might need to help the compiler find the paths to the
-  boost and casacore libraries and headers. You can control this with the `CFLAGS` environment
-  variable. For example on OS X when using homebrew and clang you need to do something like
-  this::
-
-    CFLAGS="-std=c++11 \
-            -I/usr/local/Cellar/boost/1.68.0/include/ \
-            -I/usr/local/include/  \
-            -L/usr/local/Cellar/boost/1.68.0/lib \
-            -L/usr/local/lib/" \
-            pip install python-casacore
+* If the compilation fails you might need to help the compiler find the paths
+  to the boost and casacore libraries and headers. You can control this with
+  the `CMAKE_ARGS` environment variable. For example::
+
+    $ CMAKE_ARGS="-DCASACORE_ROOT_DIR=/path/to/casacore" pip install .
 
 Support
 =======

python_casacore-3.8.1/casacore/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '3.8.1'
+__version_tuple__ = version_tuple = (3, 8, 1)
+
+__commit_id__ = commit_id = 'g97191f950'

{python_casacore-3.7.1 → python_casacore-3.8.1}/cmake/FindCasacore.cmake

@@ -13,7 +13,7 @@
 # For this, you need to have a complete casacore installation, built with shared
 # libraries, at your disposal.
 #
-# The dependencies in this macro were generated against casacore release 1.7.0.
+# The dependencies in this macro were generated against casacore release 2.0.
 #
 # Variables used by this module:
 #  CASACORE_ROOT_DIR         - Casacore root directory.
@@ -24,6 +24,7 @@
 #  CASACORE_FOUND            - System has Casacore, which means that the
 #                              include dir was found, as well as all
 #                              libraries specified (not cached)
+#  CASACORE_VERSION          - Found version, e.g. "3.6.1" (not cached)
 #  CASACORE_INCLUDE_DIR      - Casacore include directory (cached)
 #  CASACORE_INCLUDE_DIRS     - Casacore include directories (not cached)
 #                              identical to CASACORE_INCLUDE_DIR
@@ -112,13 +113,11 @@ endmacro(casacore_find_library _name)
 #   Usage: casacore_find_package(name [REQUIRED])
 #
 macro(casacore_find_package _name)
-  if("${ARGN}" MATCHES "^REQUIRED$" AND
-      Casacore_FIND_REQUIRED AND
-      NOT CASACORE_MAKE_REQUIRED_EXTERNALS_OPTIONAL)
-    find_package(${_name} REQUIRED)
-  else()
-    find_package(${_name})
+  set(_arg_list ${ARGN})
+  if(NOT Casacore_FIND_REQUIRED OR CASACORE_MAKE_REQUIRED_EXTERNALS_OPTIONAL)
+    list(REMOVE_ITEM _arg_list "REQUIRED")
   endif()
+  find_package(${_name} ${_arg_list})
   if(${_name}_FOUND)
     list(APPEND CASACORE_INCLUDE_DIRS ${${_name}_INCLUDE_DIRS})
     list(APPEND CASACORE_LIBRARIES ${${_name}_LIBRARIES})
@@ -150,12 +149,12 @@ set(Casacore_coordinates_DEPENDENCIES   fits measures casa)
 set(Casacore_derivedmscal_DEPENDENCIES  ms measures tables casa)
 set(Casacore_fits_DEPENDENCIES          measures tables casa)
 set(Casacore_images_DEPENDENCIES        coordinates mirlib lattices fits measures scimath tables casa)
-set(Casacore_lattices_DEPENDENCIES      scimath tables casa)
+set(Casacore_lattices_DEPENDENCIES      tables scimath casa)
 set(Casacore_meas_DEPENDENCIES          measures tables casa)
 set(Casacore_measures_DEPENDENCIES      tables casa)
 set(Casacore_mirlib_DEPENDENCIES)
 set(Casacore_ms_DEPENDENCIES            measures scimath tables casa)
-set(Casacore_msfits_DEPENDENCIES        ms fits measures scimath tables casa)
+set(Casacore_msfits_DEPENDENCIES        ms fits measures tables casa)
 set(Casacore_python3_DEPENDENCIES       casa)
 set(Casacore_scimath_DEPENDENCIES       scimath_f casa)
 set(Casacore_scimath_f_DEPENDENCIES)
@@ -166,6 +165,7 @@ set(CASACORE_FOUND FALSE)
 set(CASACORE_DEFINITIONS)
 set(CASACORE_LIBRARIES)
 set(CASACORE_MISSING_COMPONENTS)
+set(CASACORE_VERSION)
 
 # Search for the header file first.
 if(NOT CASACORE_INCLUDE_DIR)
@@ -209,7 +209,7 @@ else(NOT CASACORE_INCLUDE_DIR)
   foreach(_comp ${_find_components})
     casacore_find_library(casa_${_comp})
     if(${_comp} STREQUAL casa)
-      casacore_find_package(HDF5)
+      casacore_find_package(HDF5 COMPONENTS CXX)
       casacore_find_library(m)
       list(APPEND CASACORE_LIBRARIES ${CMAKE_DL_LIBS})
     elseif(${_comp} STREQUAL coordinates)
@@ -242,6 +242,25 @@ if(CASACORE_FOUND)
   set(HAVE_AIPSPP TRUE CACHE INTERNAL "Define if AIPS++/Casacore is installed")
 endif(CASACORE_FOUND)
 
+# Check version requirements
+file(WRITE ${CMAKE_BINARY_DIR}/casacore_version.cpp "#include <iostream>\n#include <casacore/casa/version.h>\nint main(int argc,char *argv[]) { std::cout << CASACORE_VERSION; return 0; }\n")
+try_run(CASACORE_VERSION_RUN_RESULT CASACORE_VERSION_COMPILE_RESULT ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/casacore_version.cpp
+  RUN_OUTPUT_VARIABLE CASACORE_VERSION
+  COMPILE_DEFINITIONS "-I${CASACORE_INCLUDE_DIR}" )
+if (CASACORE_FOUND AND CASACORE_VERSION)
+    if (Casacore_FIND_VERSION)
+        if (Casacore_FIND_VERSION_EXACT)
+            if (NOT CASACORE_VERSION VERSION_EQUAL Casacore_FIND_VERSION)
+                message(FATAL_ERROR "Found Casacore version ${CASACORE_VERSION}, but EXACT version ${Casacore_FIND_VERSION} is required.")
+            endif()
+        else()
+            if (CASACORE_VERSION VERSION_LESS Casacore_FIND_VERSION)
+                message(FATAL_ERROR "Found Casacore version ${CASACORE_VERSION}, but at least version ${Casacore_FIND_VERSION} is required.")
+            endif()
+        endif()
+    endif()
+endif()
+
 # Compose diagnostic message if not all necessary components were found.
 if(CASACORE_MISSING_COMPONENTS)
   set(CASACORE_ERROR_MESSAGE "Casacore: the following components could not be found:\n     ${CASACORE_MISSING_COMPONENTS}")
@@ -250,7 +269,7 @@ endif(CASACORE_MISSING_COMPONENTS)
 # Print diagnostics.
 if(CASACORE_FOUND)
   if(NOT Casacore_FIND_QUIETLY)
-    message(STATUS "Found the following Casacore components: ")
+    message(STATUS "Found Casacore (version ${CASACORE_VERSION}) with the following components:")
     foreach(_comp ${_find_components})
       string(TOUPPER casa_${_comp} _COMP)
       message(STATUS "  ${_comp}: ${${_COMP}_LIBRARY}")

{python_casacore-3.7.1 → python_casacore-3.8.1}/pyproject.toml

@@ -20,7 +20,7 @@ dynamic = ["version"]
 keywords = ["pyrap", "casacore", "utilities", "astronomy"]
 license = {file = "LICENSE"}
 readme = {file = "README.rst", content-type = "text/x-rst"}
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 authors = [
     {name = "Malte Marquarding", email = "Malte.Marquarding@gmail.com"},
     {name = "Ger van Diepen", email = "gervandiepen@gmail.com"},
@@ -51,10 +51,11 @@ Homepage = "https://github.com/casacore/python-casacore"
 #########################
 
 [tool.cibuildwheel]
-build = "cp3{8,9,10,11,12,13}-*_x86_64"
+build = "cp3{10,11,12,13,14}-*_x86_64"
 build-verbosity = 1
 environment = """ \
     CXXFLAGS="-I/usr/include/cfitsio" \
+    LD_LIBRARY_PATH=/opt/boost/lib \
 """
 test-command = "cd {package}/tests && pytest"
 test-requires = "pytest"
@@ -68,29 +69,25 @@ repair-wheel-command = """\
 [tool.cibuildwheel.linux]
 skip = ["*-musllinux_*"]
 
-[[tool.cibuildwheel.overrides]]
-select="cp38-*"
-manylinux-x86_64-image = "quay.io/casacore/casacore:py38_v3.7.1"
-
-[[tool.cibuildwheel.overrides]]
-select="cp39-*"
-manylinux-x86_64-image = "quay.io/casacore/casacore:py39_v3.7.1"
-
 [[tool.cibuildwheel.overrides]]
 select="cp310-*"
-manylinux-x86_64-image = "quay.io/casacore/casacore:py310_v3.7.1"
+manylinux-x86_64-image = "quay.io/casacore/casacore:py310_v3.8.1"
 
 [[tool.cibuildwheel.overrides]]
 select="cp311-*"
-manylinux-x86_64-image = "quay.io/casacore/casacore:py311_v3.7.1"
+manylinux-x86_64-image = "quay.io/casacore/casacore:py311_v3.8.1"
 
 [[tool.cibuildwheel.overrides]]
 select="cp312-*"
-manylinux-x86_64-image = "quay.io/casacore/casacore:py312_v3.7.1"
+manylinux-x86_64-image = "quay.io/casacore/casacore:py312_v3.8.1"
 
 [[tool.cibuildwheel.overrides]]
 select="cp313-*"
-manylinux-x86_64-image = "quay.io/casacore/casacore:py313_v3.7.1"
+manylinux-x86_64-image = "quay.io/casacore/casacore:py313_v3.8.1"
+
+[[tool.cibuildwheel.overrides]]
+select="cp314-*"
+manylinux-x86_64-image = "quay.io/casacore/casacore:py314_v3.8.1"
 
 
 #########################

python_casacore-3.7.1/casacore/_version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '3.7.1'
-__version_tuple__ = version_tuple = (3, 7, 1)