[python-astropy] 02/02: Update debian files to new version; remove legacy packages that are no longer supported upstream
Ole Streicher
olebole-guest at moszumanska.debian.org
Sat Nov 30 13:28:42 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository python-astropy.
commit c199eec81d529fcd74101d1d090f68178268b645
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sat Nov 30 13:12:50 2013 +0100
Update debian files to new version; remove legacy packages that are no longer supported upstream
---
debian/changelog | 7 ++++++
debian/clean | 12 ++++++-----
debian/control | 38 +--------------------------------
debian/patches/series | 1 -
debian/patches/silence_np_warning.patch | 17 ---------------
debian/python-astropy-legacy.install | 3 ---
debian/python3-astropy-legacy.install | 3 ---
debian/rules | 5 ++++-
debian/watch | 2 +-
9 files changed, 20 insertions(+), 68 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fea1111..18c9560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-astropy (0.3-1) unstable; urgency=low
+
+ * New upstream version.
+ * Remove legacy packages that are no longer supported upstream.
+
+ -- Ole Streicher <debian at liska.ath.cx> Sat, 30 Nov 2013 12:56:34 +0100
+
python-astropy (0.2.5-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/clean b/debian/clean
index 534e4e1..390b4fb 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,11 +1,13 @@
astropy/astropy.cfg
astropy/cython_version.py
-astropy/nddata/convolution/boundary_extend.c
-astropy/nddata/convolution/boundary_fill.c
-astropy/nddata/convolution/boundary_none.c
-astropy/nddata/convolution/boundary_wrap.c
-astropy/time/sofa_time.c
+astropy/convolution/boundary_extend.c
+astropy/convolution/boundary_fill.c
+astropy/convolution/boundary_none.c
+astropy/convolution/boundary_wrap.c
+astropy/table/_np_utils.c
+astropy/time/erfa_time.c
astropy/version.py
astropy/wcs/include/docstrings.h
astropy/wcs/include/wcsconfig.h
astropy/wcs/src/docstrings.c
+docs/api/*
diff --git a/debian/control b/debian/control
index 9ccf7fd..513c19f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: cython,
debhelper (>= 9),
graphviz,
libcfitsio3-dev,
+ liberfa-dev,
libexpat1-dev,
- libsofa-c-dev,
pkg-config,
python-all-dev (>= 2.6.6-3~),
python-matplotlib,
@@ -74,39 +74,3 @@ Description: Core functionality for performing astrophysics with Python (doc)
.
This package contains the package documentation.
-Package: python-astropy-legacy
-Architecture: all
-Priority: extra
-Depends: python-astropy,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Conflicts: python-pyfits,
- python-pywcs
-Provides: python-pyfits,
- python-pywcs,
- python-vo.table
-Description: Astropy legacy modules for pyfits, pywcs, and vo.table
- The astropy package contains core functionality and some common tools
- needed for performing astronomy and astrophysics research with Python.
- .
- This package is a wrapper that provides legacy packages for pyfits, pywcs,
- and vo.table for older applications.
-
-Package: python3-astropy-legacy
-Architecture: all
-Priority: extra
-Depends: python3-astropy,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Provides: python3-pyfits,
- python3-pywcs,
- python3-vo.table
-Description: Astropy legacy modules for pyfits, pywcs, and vo.table (Python3)
- The astropy package contains core functionality and some common tools
- needed for performing astronomy and astrophysics research with Python3.
- .
- This package is a wrapper that provides legacy packages for pyfits, pywcs,
- and vo.table for older applications.
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 51366b6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-silence_np_warning.patch
diff --git a/debian/patches/silence_np_warning.patch b/debian/patches/silence_np_warning.patch
deleted file mode 100644
index 68c9b4c..0000000
--- a/debian/patches/silence_np_warning.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Silence a numpy warning on astropy/io/votable/tests/vo_test.py
-Bug: https://github.com/astropy/astropy/issues/1179
---- a/astropy/io/votable/tests/vo_test.py
-+++ b/astropy/io/votable/tests/vo_test.py
-@@ -717,8 +717,9 @@
-
- # We can't test xmllint, because we can't rely on it being on the
- # user's machine.
-- result = validate(get_pkg_data_filename('data/regression.xml'),
-- output, xmllint=False)
-+ with np.errstate(invalid='ignore'):
-+ result = validate(get_pkg_data_filename('data/regression.xml'),
-+ output, xmllint=False)
-
- assert result == False
-
diff --git a/debian/python-astropy-legacy.install b/debian/python-astropy-legacy.install
deleted file mode 100644
index f421846..0000000
--- a/debian/python-astropy-legacy.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python2*/dist-packages/pyfits
-usr/lib/python2*/dist-packages/pywcs
-usr/lib/python2*/dist-packages/vo
diff --git a/debian/python3-astropy-legacy.install b/debian/python3-astropy-legacy.install
deleted file mode 100644
index e022060..0000000
--- a/debian/python3-astropy-legacy.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python3*/dist-packages/pyfits
-usr/lib/python3*/dist-packages/pywcs
-usr/lib/python3*/dist-packages/vo
diff --git a/debian/rules b/debian/rules
index 7baa107..212e54e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export http_proxy = http://127.0.9.1:9
dh $@ --with python2,python3,sphinxdoc
build-python%:
- python$* setup.py build --use-system-libraries --enable-legacy
+ python$* setup.py build --use-system-libraries
# We need to build python2 first, since cython is currently only available for
# python2, and we need cython to (re-) generate some of the C files.
@@ -28,6 +28,9 @@ override_dh_auto_install: $(PYTHON3:%=install-python%)
dh_auto_install
rm -f $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/astropy/sphinx/themes/bootstrap-astropy/static/*.png
+override_dh_auto_build:
+ dh_auto_build -- --use-system-libraries
+
override_dh_shlibdeps:
dh_shlibdeps
dh_numpy
diff --git a/debian/watch b/debian/watch
index 368b572..aba2ec5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
# watch control file for uscan
version=3
-http://www.astropy.org/ .+/astropy-(.+)\.tar\.gz debian uupdate
+http://pypi.python.org/packages/source/a/astropy/astropy-([0-9].*)\.tar\.gz debian uupdate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-astropy.git
More information about the debian-science-commits
mailing list