[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. e03a9cfecb75be8f98331a18256898f4e605c7e4
Ole Streicher
debian at liska.ath.cx
Thu Feb 14 08:12:55 UTC 2013
The following commit has been merged in the debian branch:
commit e03a9cfecb75be8f98331a18256898f4e605c7e4
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Feb 14 09:12:48 2013 +0100
Update Debian files for RC release
diff --git a/debian/changelog b/debian/changelog
index dd82e85..4e378df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (0.2~rc1-1) experimental; urgency=low
+
+ * Release candidate version
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 14 Feb 2013 08:58:56 +0100
+
python-astropy (0.2~b2-1) experimental; urgency=low
* Initial release. (Closes: #678168)
diff --git a/debian/patches/fix_sphinxbuild.patch b/debian/patches/fix_sphinxbuild.patch
index 98c8ce0..44f0cc5 100644
--- a/debian/patches/fix_sphinxbuild.patch
+++ b/debian/patches/fix_sphinxbuild.patch
@@ -5,115 +5,3 @@ Description: Fix some glitches of the documentation that may prevent
+++ b/CHANGES.rst
@@ -0,0 +1 @@
+(dummy)
---- a/docs/io/registry.rst
-+++ b/docs/io/registry.rst
-@@ -4,7 +4,9 @@
- I/O Registry (`astropy.io.registry`)
- ************************************
-
--.. note:: The I/O registry is only meant to be used directly by users who want
-+.. note::
-+
-+ The I/O registry is only meant to be used directly by users who want
- to define their own custom readers/writers. Users who want to find
- out more about what built-in formats are supported by
- :class:`~astropy.table.table.Table` by default should see
---- a/astropy/nddata/convolution/convolve.py
-+++ b/astropy/nddata/convolution/convolve.py
-@@ -172,17 +172,19 @@
- Convolve an ndarray with an nd-kernel. Returns a convolved image with
- shape = array.shape. Assumes kernel is centered.
-
-- convolve_fft differs from `scipy.signal.fftconvolve` in a few ways:
-+ `convolve_fft` differs from `scipy.signal.fftconvolve` in a few ways:
-
-- * can treat NaN's as zeros or interpolate over them
-- * (optionally) pads to the nearest 2^n size to improve FFT speed
-- * only operates in mode='same' (i.e., the same shape array is returned) mode
-- * can use your own fft, e.g. pyFFTW or pyFFTW3, which can lead to
-- performance improvements, depending on your system configuration. fftw3
-+ * It can treat NaN's as zeros or interpolate over them.
-+ * (optionally) It pads to the nearest 2^n size to improve FFT speed.
-+ * Its only valid `mode` is 'same' (i.e., the same shape array is returned)
-+ * It lets you use your own fft, e.g.,
-+ `pyFFTW <http://pypi.python.org/pypi/pyFFTW>`_ or
-+ `pyFFTW3 <http://pypi.python.org/pypi/PyFFTW3/0.2.1>`_ , which can lead to
-+ performance improvements, depending on your system configuration. pyFFTW3
- is threaded, and therefore may yield significant performance benefits on
- multi-core machines at the cost of greater memory requirements. Specify
-- the :param:`fftn` and :param:`ifftn` keyword to override the default, which
-- is numpy's fft
-+ the `fftn` and `ifftn` keywords to override the default, which is
-+ `numpy.fft.fft` and `numpy.fft.ifft`.
-
- Parameters
- ----------
-@@ -245,7 +247,7 @@
- `fftn=scipy.fftpack.fftn`
- complex_dtype : np.complex
- Which complex dtype to use. `numpy` has a range of options, from 64 to
-- 256.
-+ 256.
-
- See Also
- --------
-@@ -261,36 +263,36 @@
-
- Examples
- --------
-- >>> convolve_fft([1,0,3],[1,1,1])
-+ >>> convolve_fft([1, 0, 3], [1, 1, 1])
- array([ 1., 4., 3.])
-
-- >>> convolve_fft([1,np.nan,3],[1,1,1])
-+ >>> convolve_fft([1, np.nan, 3], [1, 1, 1])
- array([ 1., 4., 3.])
-
-- >>> convolve_fft([1,0,3],[0,1,0])
-+ >>> convolve_fft([1, 0, 3], [0, 1, 0])
- array([ 1., 0., 3.])
-
-- >>> convolve_fft([1,2,3],[1])
-+ >>> convolve_fft([1, 2, 3], [1])
- array([ 1., 2., 3.])
-
-- >>> convolve_fft([1,np.nan,3],[0,1,0], interpolate_nan=True)
-+ >>> convolve_fft([1, np.nan, 3], [0, 1, 0], interpolate_nan=True)
- array([ 1., 0., 3.])
-
-- >>> convolve_fft([1,np.nan,3],[0,1,0], interpolate_nan=True, min_wt=1e-8)
-+ >>> convolve_fft([1, np.nan, 3], [0, 1, 0], interpolate_nan=True,
-+ ... min_wt=1e-8)
- array([ 1., nan, 3.])
-
-- >>> convolve_fft([1,np.nan,3],[1,1,1], interpolate_nan=True)
-+ >>> convolve_fft([1, np.nan, 3], [1, 1, 1], interpolate_nan=True)
- array([ 1., 4., 3.])
-
-- >>> convolve_fft([1,np.nan,3],[1,1,1], interpolate_nan=True,
-- normalize_kernel=True, ignore_edge_zeros=True)
-+ >>> convolve_fft([1, np.nan, 3], [1, 1, 1], interpolate_nan=True,
-+ ... normalize_kernel=True, ignore_edge_zeros=True)
- array([ 1., 2., 3.])
-
-- # optional - requires scipy
-- >>> import scipy.fftpack
-- >>> convolve_fft([1,np.nan,3],[1,1,1], interpolate_nan=True,
-- normalize_kernel=True, ignore_edge_zeros=True,
-- fftn=scipy.fftpack.fft, ifftn=scipy.fftpack.ifft)
-+ >>> import scipy.fftpack # optional - requires scipy
-+ >>> convolve_fft([1, np.nan, 3], [1, 1, 1], interpolate_nan=True,
-+ ... normalize_kernel=True, ignore_edge_zeros=True,
-+ ... fftn=scipy.fftpack.fft, ifftn=scipy.fftpack.ifft)
- array([ 1., 2., 3.])
-
- """
-@@ -347,7 +349,7 @@
- else:
- kernel_is_normalized = False
- if (interpolate_nan or ignore_edge_zeros):
-- WARNING = ("Kernel is not normalized, therefore ignore_edge_zeros"+
-+ WARNING = ("Kernel is not normalized, therefore ignore_edge_zeros"+
- "and interpolate_nan will be ignored.")
- log.warn(WARNING)
-
diff --git a/debian/patches/force_legacy_build.patch b/debian/patches/force_legacy_build.patch
deleted file mode 100644
index 5452cf3..0000000
--- a/debian/patches/force_legacy_build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: The setup tries to find out whether the original of a legacy
- package is installed. In this case, the legacy module is not built.
- This is useless in the case of Debian packaging since the dependencies
- are maintained by the package system. So, this mechanism is switched off
- here.
---- a/astropy/setup_helpers.py
-+++ b/astropy/setup_helpers.py
-@@ -723,7 +723,7 @@
-
- shim_dir = os.path.join(get_legacy_alias_dir(), old_package)
-
-- if found_legacy_module and not is_distutils_display_option():
-+ if False:
- warn('-' * 60)
- warn("The legacy package '{0}' was found.".format(old_package))
- warn("To install astropy's compatibility layer instead, uninstall")
diff --git a/debian/patches/install_on_py2.6.patch b/debian/patches/install_on_py2.6.patch
deleted file mode 100644
index 14348c2..0000000
--- a/debian/patches/install_on_py2.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: (Temporarily) replace subprocess.check_output
- to allow installation under Python 2.6.
-Bug: https://github.com/astropy/astropy/issues/769
---- a/astropy/setup_helpers.py
-+++ b/astropy/setup_helpers.py
-@@ -1244,7 +1244,8 @@
- command = "pkg-config --libs --cflags {0}".format(' '.join(packages)),
-
- try:
-- output = subprocess.check_output(command, shell=True)
-+ process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
-+ output = process.communicate()[0].strip()
- except subprocess.CalledProcessError as e:
- lines = [
- "pkg-config failed. This may cause the build to fail below.",
diff --git a/debian/patches/series b/debian/patches/series
index 470ec3b..6783f67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-install_on_py2.6.patch
fix_sphinxbuild.patch
--
Core functionality for performing astronomy and astrophysics with Python
More information about the debian-science-commits
mailing list