...
 
Commits (3)
pyraf (2.1.15-2) unstable; urgency=low
* Remove Python 2 package
* Push Standards-Version to 4.2.1. No changes needed
-- Ole Streicher <olebole@debian.org> Fri, 14 Dec 2018 08:32:47 +0100
pyraf (2.1.15-1) unstable; urgency=low
* Switch watch to use pypi
......
......@@ -6,13 +6,6 @@ Build-Depends: debhelper (>= 11),
dh-python,
iraf,
libx11-dev,
python-all-dev,
python-astropy,
python-numpy-dev,
python-setuptools (>= 0.6.4),
python-stsci.distutils (>= 0.3.2),
python-stsci.tools,
python-tk,
python3-all-dev,
python3-astropy,
python3-numpy-dev,
......@@ -21,32 +14,11 @@ Build-Depends: debhelper (>= 11),
python3-stsci.tools,
python3-tk
Section: python
Standards-Version: 4.2.0
Standards-Version: 4.2.1
Homepage: http://www.stsci.edu/institute/software_hardware/pyraf
Vcs-Browser: https://salsa.debian.org/debian-astro-team/pyraf
Vcs-Git: https://salsa.debian.org/debian-astro-team/pyraf.git
Package: python-pyraf
Architecture: any
Depends: iraf,
python-stsci.tools,
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Provides: ${python:Provides}
Recommends: python-numpy, python-tk
Suggests: ipython, python-matplotlib, python-urwid
Description: Python 2 interface for IRAF
PyRAF is a command language for running IRAF tasks in a Python like
environment. It works very similar to IRAF CL, but has been updated
to allow such things as importing Python modules, GUI parameter
editing and help. It can be imported into Python allowing you to run
IRAF commands from within a larger script.
.
Note that this package does not include the pyraf command. To run
pyraf directly from the command line, use the python3-pyraf package
instead.
Package: python3-pyraf
Architecture: any
Depends: iraf,
......@@ -57,7 +29,7 @@ Depends: iraf,
Provides: ${python3:Provides}
Recommends: python3-numpy, python3-tk
Suggests: ipython3, python3-matplotlib, python3-urwid
Description: Python 3 interface for IRAF
Description: Python interface for IRAF
PyRAF is a command language for running IRAF tasks in a Python like
environment. It works very similar to IRAF CL, but has been updated
to allow such things as importing Python modules, GUI parameter
......
......@@ -7,10 +7,10 @@ Subject: Fix FTBFS for GNU HURD
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pyraf_setup.py b/lib/pyraf_setup.py
index 5aac682..e623fb1 100644
index ddd1437..0acaaf2 100644
--- a/lib/pyraf_setup.py
+++ b/lib/pyraf_setup.py
@@ -53,7 +53,7 @@ def _find_x(xdir=None):
@@ -50,7 +50,7 @@ def _find_x(xdir=None):
lib_dirs = []
inc_dirs = []
......
From: Ole Streicher <olebole@debian.org>
Date: Tue, 19 Dec 2017 21:19:47 +0100
Subject: Install pyraf script only for Python 3
---
lib/pyraf_setup.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/pyraf_setup.py b/lib/pyraf_setup.py
index ddd1437..5aac682 100644
--- a/lib/pyraf_setup.py
+++ b/lib/pyraf_setup.py
@@ -25,6 +25,9 @@ def setup_hook(config):
config['files']['scripts'] += '\n' + '\n'.join(additional_scripts)
+ if sys.version_info < (3,):
+ del config['files']['scripts']
+
def build_ext_hook(command):
"""Adds the correct library directories for X11. I've found that on Linux
Use-system-provided-iraf-by-default.patch
Install-pyraf-script-only-for-Python-3.patch
Fix-FTBFS-for-GNU-HURD.patch
debian/ipythonrc-pyraf usr/lib/python2.7/dist-packages/pyraf/
......@@ -3,7 +3,7 @@
export PYBUILD_NAME = pyraf
%:
dh $@ --with python2,python3 --buildsystem=pybuild
dh $@ --with python3 --buildsystem=pybuild
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
......
Test-Command: python debian/tests/pyraf-test.py
Depends: python-pyraf, python-tk, python-astropy
Restrictions: allow-stderr
Test-Command: python3 debian/tests/pyraf-test.py
Depends: python3-pyraf, python3-tk, python3-astropy
Restrictions: allow-stderr