* [gentoo-commits] repo/gentoo:master commit in: dev-python/fitsio/, dev-python/fitsio/files/
@ 2022-04-11 7:57 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-04-11 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 1b565fbf5e0244136aa1f1b3a5aa1faf0b25440b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 07:54:49 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 07:54:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b565fbf
dev-python/fitsio: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/fitsio/Manifest | 1 -
.../fitsio/files/fitsio-0.9.11-test-failures.patch | 38 ----------------------
dev-python/fitsio/fitsio-0.9.11.ebuild | 38 ----------------------
3 files changed, 77 deletions(-)
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index 5d468a97cfeb..218062451e1a 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,2 +1 @@
-DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
DIST fitsio-1.1.7.gh.tar.gz 5052055 BLAKE2B be9c632dcdd08325c5abb2cb9ed9eee6476b27ef2e7197298b269156346ecb72afc9f1d1c2e3ade045f69cde3afac5a6bf3fe5ecbce67fdfc1e6ede529ab1b32 SHA512 d6e81de08c38346050fbaa3e2fb51a496e76133bb0b04f20d816b51b7b7bf21ba37a400c3a6a7f966959223545c736ca6245427457154a4b5976b5a997e9cfcc
diff --git a/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch b/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
deleted file mode 100644
index 243913dc659e..000000000000
--- a/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Fri, 15 Jul 2016 08:46:15 +0200
-Subject: Mark failures that are known to fail with the original cfitsio
-
----
- fitsio/test.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/fitsio/test.py b/fitsio/test.py
-index bafde15..49a4b3b 100644
---- a/fitsio/test.py
-+++ b/fitsio/test.py
-@@ -545,7 +545,7 @@ class TestReadWrite(unittest.TestCase):
- try:
- with fitsio.FITS(fname,'rw',clobber=True) as fits:
- # note i8 not supported for compressed!
-- dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
-+ dtypes = ['u1','i1', 'i2','u4','i4','f4','f8']
-
- for dtype in dtypes:
- data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
-@@ -569,7 +569,7 @@ class TestReadWrite(unittest.TestCase):
- try:
- with fitsio.FITS(fname,'rw',clobber=True) as fits:
- # note i8 not supported for compressed!
-- dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
-+ dtypes = ['u1','i1', 'i2','u4','i4','f4','f8']
-
- for dtype in dtypes:
- data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
-@@ -1365,6 +1365,7 @@ class TestReadWrite(unittest.TestCase):
- if os.path.exists(fname):
- os.remove(fname)
-
-+ @unittest.skip("bzip2 is not supported with debian cfitsio package")
- def testBz2Read(self):
- '''
- Write a normal .fits file, run bzip2 on it, then read the bz2
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
deleted file mode 100644
index c58f52da2827..000000000000
--- a/dev-python/fitsio/fitsio-0.9.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to read from and write to FITS files"
-HOMEPAGE="https://github.com/esheldon/fitsio"
-SRC_URI="https://github.com/esheldon/fitsio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/numpy-1.11[${PYTHON_USEDEP}]
- sci-libs/cfitsio:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-test-failures.patch )
-
-python_prepare_all() {
- sed -e '/self.use_system_fitsio/s/False/True/' \
- -i setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- pushd "${TEST_DIR}"/ || die
- ${PYTHON} -c "import fitsio; exit(fitsio.test.test())" || die
- popd > /dev/null || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/fitsio/, dev-python/fitsio/files/
@ 2024-06-19 4:36 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-06-19 4:36 UTC (permalink / raw
To: gentoo-commits
commit: d7f25e118224af6b1004d870edf379c86f5f8462
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 04:25:37 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 04:25:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f25e11
dev-python/fitsio: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/fitsio/Manifest | 3 -
dev-python/fitsio/files/fitsio-1.2.1-numpy-2.patch | 159 ---------------------
dev-python/fitsio/fitsio-1.2.1-r1.ebuild | 42 ------
dev-python/fitsio/fitsio-1.2.1-r2.ebuild | 50 -------
dev-python/fitsio/fitsio-1.2.2.ebuild | 41 ------
5 files changed, 295 deletions(-)
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index 1c91da84fa52..a08d8b604256 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,4 +1 @@
-DIST fitsio-1.2.1-gcc-14.patch 30464 BLAKE2B 328d6321b68bd2f568aea649d2d8d7db4c2f8077f1208cec6199b1cc9399446f063d1010d586b77d635727c2285e9504bbfab614fbaae59f6c4638c7f7188372 SHA512 e1fea1968688cf265bfc8735c95b1ca211628fdea901d37b3cb4f76239c0a7c8e589fb78429e3535e3e1a2c25e1aec8929fe21db3a32d929774267c559464c2a
-DIST fitsio-1.2.1.gh.tar.gz 4584464 BLAKE2B 376d2afe2e637075fca88c24c17117600973dc81fbb006e3e8bf4ddab023db6a466653187b686a4beb75339559cb4b77e0bf927f09c991d9205ffb0e66ad17a6 SHA512 645c117c394a18cdbb0c5033a1446e1f6e6473f54d9556b7591f33873855a70860343b3e4811284d7dfa16696ef23a1abb74ee638318d7295eb85ec4b17f0309
-DIST fitsio-1.2.2.gh.tar.gz 4584305 BLAKE2B 285037e173d9e4dca1ac6d32012a23310c10bf3d1299af275b93dd749f34fe8f417e7d2f9062e9362416a1e6d4b2876a351041e1102c07209b89e0fdac6b647f SHA512 a479490cfdda28481b2e5d04033e7dcb9c97b99f22f2cb29c7bdb38015bd5a2d2ea7ccd291e109a0551b0340575ab5123fb8edc924766a15548112fdeb700677
DIST fitsio-1.2.3.gh.tar.gz 4507743 BLAKE2B 2b38b9b1be3eb7ab5ed67954f6c1310c03a99cbae71bb5716702d31bc69e09f8d73fb86696edb06bba78093d48ad784f280e7023fadc932190a82ce6748cf5af SHA512 11c2e8e26019bdc364d2a566c0680baa85d93a0a49eb9e5fc0ccc79f2566c616634a8bf10f1d8dbb4c1393675d11bb8d4e469d2f30a8cb88bfa73697ac9d4c57
diff --git a/dev-python/fitsio/files/fitsio-1.2.1-numpy-2.patch b/dev-python/fitsio/files/fitsio-1.2.1-numpy-2.patch
deleted file mode 100644
index cfc0b99a8f17..000000000000
--- a/dev-python/fitsio/files/fitsio-1.2.1-numpy-2.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/fitsio/fitslib.py b/fitsio/fitslib.py
-index 7ef718b..3d43549 100644
---- a/fitsio/fitslib.py
-+++ b/fitsio/fitslib.py
-@@ -25,7 +25,7 @@
- import numpy
-
- from . import _fitsio_wrap
--from .util import IS_PY3, mks, array_to_native, isstring
-+from .util import IS_PY3, mks, array_to_native, isstring, copy_if_needed
- from .header import FITSHDR
- from .hdu import (
- ANY_HDU, IMAGE_HDU, BINARY_TBL, ASCII_TBL,
-@@ -957,7 +957,7 @@ def create_image_hdu(self,
- if IS_PY3 and img2send.dtype.char == 'U':
- # for python3, we convert unicode to ascii
- # this will error if the character is not in ascii
-- img2send = img2send.astype('S', copy=False)
-+ img2send = img2send.astype('S', copy=copy_if_needed)
-
- else:
- self._ensure_empty_image_ok()
-@@ -1738,7 +1738,7 @@ def npy_obj2fits(data, name=None):
- else:
- fits_dtype = _table_npy2fits_form['S']
- else:
-- arr0 = numpy.array(first, copy=False)
-+ arr0 = numpy.array(first, copy=copy_if_needed)
- dtype0 = arr0.dtype
- npy_dtype = dtype0.descr[0][1][1:]
- if npy_dtype[0] == 'S' or npy_dtype[0] == 'U':
-diff --git a/fitsio/hdu/image.py b/fitsio/hdu/image.py
-index 8c06bcf..a2d16c8 100644
---- a/fitsio/hdu/image.py
-+++ b/fitsio/hdu/image.py
-@@ -27,7 +27,7 @@
-
- from math import floor
- from .base import HDUBase, IMAGE_HDU
--from ..util import IS_PY3, array_to_native
-+from ..util import IS_PY3, array_to_native, copy_if_needed
-
- # for python3 compat
- if IS_PY3:
-@@ -146,7 +146,7 @@ def write(self, img, start=0, **keys):
- if IS_PY3 and img_send.dtype.char == 'U':
- # for python3, we convert unicode to ascii
- # this will error if the character is not in ascii
-- img_send = img_send.astype('S', copy=False)
-+ img_send = img_send.astype('S', copy=copy_if_needed)
-
- if not numpy.isscalar(start):
- # convert to scalar offset
-diff --git a/fitsio/hdu/table.py b/fitsio/hdu/table.py
-index f210121..3b462b1 100644
---- a/fitsio/hdu/table.py
-+++ b/fitsio/hdu/table.py
-@@ -36,7 +36,8 @@
- array_to_native,
- array_to_native_c,
- FITSRuntimeWarning,
-- mks
-+ mks,
-+ copy_if_needed,
- )
- from .base import HDUBase, ASCII_TBL, IMAGE_HDU, _hdu_type_map
-
-@@ -282,7 +283,7 @@ def write(self, data, firstrow=0, columns=None, names=None, slow=False,
- if IS_PY3 and colref.dtype.char == 'U':
- # for python3, we convert unicode to ascii
- # this will error if the character is not in ascii
-- colref = colref.astype('S', copy=False)
-+ colref = colref.astype('S', copy=copy_if_needed)
-
- nonobj_arrays.append(colref)
-
-@@ -347,7 +348,7 @@ def write_column(self, column, data, firstrow=0, **keys):
- if IS_PY3 and data_send.dtype.char == 'U':
- # for python3, we convert unicode to ascii
- # this will error if the character is not in ascii
-- data_send = data_send.astype('S', copy=False)
-+ data_send = data_send.astype('S', copy=copy_if_needed)
-
- self._verify_column_data(colnum, data_send)
-
-@@ -1420,13 +1421,13 @@ def _extract_rows(self, rows, sort=False):
- Extract an array of rows from an input scalar or sequence
- """
- if rows is not None:
-- rows = np.array(rows, ndmin=1, copy=False, dtype='i8')
-+ rows = np.array(rows, ndmin=1, copy=copy_if_needed, dtype='i8')
- if sort:
- rows = np.unique(rows)
- return rows, None
-
- # returns unique, sorted. Force i8 for 32-bit systems
-- sortind = np.array(rows.argsort(), dtype='i8', copy=False)
-+ sortind = np.array(rows.argsort(), dtype='i8', copy=copy_if_needed)
-
- maxrow = self._info['nrows']-1
- if rows.size > 0:
-@@ -1583,7 +1584,7 @@ def _maybe_decode_fits_ascii_strings_to_unicode_py3(self, array):
- else:
- new_dt.append(_dt)
- if do_conversion:
-- array = array.astype(new_dt, copy=False)
-+ array = array.astype(new_dt, copy=copy_if_needed)
- return array
-
- def _convert_bool_array(self, array):
-@@ -1721,7 +1722,7 @@ def _read_var_column(self, colnum, rows, sortind, vstorage):
- descr = 'S%d' % max_size
- array = np.fromiter(dlist, descr)
- if IS_PY3:
-- array = array.astype('U', copy=False)
-+ array = array.astype('U', copy=copy_if_needed)
- else:
- descr = dlist[0].dtype.str
- array = np.zeros((len(dlist), max_size), dtype=descr)
-diff --git a/fitsio/util.py b/fitsio/util.py
-index 562b609..5d337be 100644
---- a/fitsio/util.py
-+++ b/fitsio/util.py
-@@ -41,7 +41,10 @@ def cfitsio_version(asfloat=False):
- numpy.uint64, numpy.int64)
-
- # different for py3
--_stypes += (numpy.string_, numpy.str_)
-+if numpy.lib.NumpyVersion(numpy.__version__) < "1.28.0":
-+ _stypes += (numpy.string_, numpy.str_,)
-+else:
-+ _stypes += (numpy.bytes_, numpy.str_,)
-
- # for header keywords
- _ftypes = (float, numpy.float32, numpy.float64)
-@@ -134,9 +137,22 @@ def array_to_native(array, inplace=False):
- return output
-
-
-+if numpy.lib.NumpyVersion(numpy.__version__) >= "2.0.0":
-+ copy_if_needed = None
-+elif numpy.lib.NumpyVersion(numpy.__version__) < "1.28.0":
-+ copy_if_needed = False
-+else:
-+ # 2.0.0 dev versions, handle cases where copy may or may not exist
-+ try:
-+ numpy.array([1]).__array__(copy=None)
-+ copy_if_needed = None
-+ except TypeError:
-+ copy_if_needed = False
-+
-+
- def array_to_native_c(array_in, inplace=False):
- # copy only made if not C order
-- arr = numpy.array(array_in, order='C', copy=False)
-+ arr = numpy.array(array_in, order='C', copy=copy_if_needed)
- return array_to_native(arr, inplace=inplace)
-
-
diff --git a/dev-python/fitsio/fitsio-1.2.1-r1.ebuild b/dev-python/fitsio/fitsio-1.2.1-r1.ebuild
deleted file mode 100644
index 95d01f95502b..000000000000
--- a/dev-python/fitsio/fitsio-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to read from and write to FITS files"
-HOMEPAGE="
- https://github.com/esheldon/fitsio/
- https://pypi.org/project/fitsio/
-"
-SRC_URI="
- https://github.com/esheldon/fitsio/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- <dev-python/numpy-2[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.11[${PYTHON_USEDEP}]
- sci-libs/cfitsio:0=
-"
-RDEPEND="
- ${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-export FITSIO_USE_SYSTEM_FITSIO=1
-
-python_test() {
- cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
- epytest
-}
diff --git a/dev-python/fitsio/fitsio-1.2.1-r2.ebuild b/dev-python/fitsio/fitsio-1.2.1-r2.ebuild
deleted file mode 100644
index 5ad63bf814ce..000000000000
--- a/dev-python/fitsio/fitsio-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to read from and write to FITS files"
-HOMEPAGE="
- https://github.com/esheldon/fitsio/
- https://pypi.org/project/fitsio/
-"
-SRC_URI="
- https://github.com/esheldon/fitsio/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- https://github.com/esheldon/fitsio/pull/394.patch
- -> fitsio-1.2.1-gcc-14.patch
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- >=dev-python/numpy-1.11:=[${PYTHON_USEDEP}]
- sci-libs/cfitsio:0=
-"
-RDEPEND="
- ${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/esheldon/fitsio/pull/394
- "${DISTDIR}/${P}-gcc-14.patch"
- # https://github.com/esheldon/fitsio/pull/390
- "${FILESDIR}/${P}-numpy-2.patch"
-)
-
-export FITSIO_USE_SYSTEM_FITSIO=1
-
-python_test() {
- cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
- epytest
-}
diff --git a/dev-python/fitsio/fitsio-1.2.2.ebuild b/dev-python/fitsio/fitsio-1.2.2.ebuild
deleted file mode 100644
index c0c1388a3eba..000000000000
--- a/dev-python/fitsio/fitsio-1.2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to read from and write to FITS files"
-HOMEPAGE="
- https://github.com/esheldon/fitsio/
- https://pypi.org/project/fitsio/
-"
-SRC_URI="
- https://github.com/esheldon/fitsio/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- >=dev-python/numpy-1.11:=[${PYTHON_USEDEP}]
- sci-libs/cfitsio:0=
-"
-RDEPEND="
- ${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-export FITSIO_USE_SYSTEM_FITSIO=1
-
-python_test() {
- cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
- epytest
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-19 4:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-19 4:36 [gentoo-commits] repo/gentoo:master commit in: dev-python/fitsio/, dev-python/fitsio/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-04-11 7:57 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox