...
 
Commits (5)
cpl-plugin-visir (4.3.7+dfsg-1) unstable; urgency=low
* Update VCS fields to use salsa.d.o
* Use name-based sorting for the recipes to ensure reproducible build
(Closes: #890314)
* New upstream version 4.3.7+dfsg. Rediff patches
* Push Standards-Version to 4.1.4. Change remaining URLs to https
* Push compat to 11
* Switch to Python 3
* Adjust documentation path
-- Ole Streicher <olebole@debian.org> Fri, 27 Apr 2018 16:23:04 +0200
cpl-plugin-visir (4.3.3+dfsg-1) unstable; urgency=low
* New upstream version 4.3.3+dfsg
......
......@@ -3,22 +3,21 @@ Section: science
Priority: optional
Maintainer: Debian Astronomy Team <debian-astro-maintainers@lists.alioth.debian.org>
Uploaders: Ole Streicher <olebole@debian.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
Build-Depends: debhelper (>= 11),
libcpl-dev (>= 5.3.1),
python,
python-astropy,
python-cpl,
python-sphinx
Standards-Version: 4.0.0
Homepage: http://www.eso.org/sci/software/pipelines/visir
python3,
python3-astropy,
python3-cpl,
python3-sphinx
Standards-Version: 4.1.4
Homepage: https://www.eso.org/sci/software/pipelines/visir
Vcs-Git: https://salsa.debian.org/debian-astro-team/cpl-plugin-visir.git
Vcs-Browser: https://salsa.debian.org/debian-astro-team/cpl-plugin-visir
Package: cpl-plugin-visir
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
Recommends: esorex | python3-cpl
Suggests: cpl-plugin-visir-calib, cpl-plugin-visir-doc
Multi-Arch: same
Description: ESO data reduction pipeline for the VISIR instrument
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: visir
Upstream-Contact: ESO User Support Department <usd-help@eso.org>
Source: ftp://ftp.eso.org/pub/dfs/pipelines/visir/
......
......@@ -12,5 +12,5 @@ Abstract: The __PIPELINE__ pipeline is a subsystem of the Data Flow System
This document describes the Python interface for the __PIPELINE__ pipeline.
Format: HTML
Index: /usr/share/doc/cpl-plugin-__PIPELINE__-doc/html/index.html
Files: /usr/share/doc/cpl-plugin-__PIPELINE__-doc/html/*
Index: /usr/share/doc/cpl-plugin-__PIPELINE__/html/index.html
Files: /usr/share/doc/cpl-plugin-__PIPELINE__/html/*
#!/usr/bin/env python
#!/usr/bin/env python3
import cpl
import os
......@@ -31,13 +31,13 @@ a PDF file using the following URL:
.B ftp://ftp.eso.org/pub/dfs/pipelines/visir/visir-pipeline-manual-1.4.pdf
.PP
An overview over the existing ESO pipelines can be found on the web page
\\fBhttp://www.eso.org/sci/software/pipelines/\\fR.
\\fBhttps://www.eso.org/sci/software/pipelines/\\fR.
.PP
Basic documentation about the EsoRex program can be found at the esorex (1)
man page.
.PP
It is possible to call the pipelines from python using the python-cpl package.
See \\fBhttp://packages.python.org/python-cpl/index.html\\fR for further
See \\fBhttps://packages.python.org/python-cpl/index.html\\fR for further
information.
.PP
The other recipes of the {pipeline} pipeline are
......
#!/usr/bin/env python
#!/usr/bin/env python3
import cpl
import os
......@@ -35,7 +35,7 @@ Constructor
{parameters}
.. seealso:: `cpl.Recipe <http://packages.python.org/python-cpl/recipe.html>`_
.. seealso:: `cpl.Recipe <https://packages.python.org/python-cpl/recipe.html>`_
for more information about the recipe object.
Bug reports
......@@ -78,10 +78,10 @@ These pages describe the python interface for the {PIPELINE} pipeline recipes.
* The `{PIPELINE} Pipeline User Manual
<ftp://ftp.eso.org/pub/dfs/pipelines/visir/visir-pipeline-manual-1.4.pdf>`_ in PDF format,
* an `overview <http://www.eso.org/sci/software/pipelines/>`_
* an `overview <https://www.eso.org/sci/software/pipelines/>`_
over the existing ESO pipelines,
* the `python-cpl <http://packages.python.org/python-cpl>`_ package.
* the `python-cpl <https://packages.python.org/python-cpl>`_ package.
Bug reports
===========
......@@ -139,7 +139,7 @@ pipeline = sys.argv[1]
cpl.Recipe.path = "recipes"
recipes = [ cpl.Recipe(name) for name, version in cpl.Recipe.list() ]
oca = file(os.path.join("calib", "gasgano", "config", pipeline + ".oca")).read()
oca = open(os.path.join("calib", "gasgano", "config", pipeline + ".oca")).read()
oca = oca[oca.find("action"):]
recipes_oca = [recipe for recipe in recipes if recipe.__name__ in oca]
recipes_oca.sort(key = lambda x: x.__name__)
......
......@@ -2,16 +2,16 @@
# -*- makefile -*-
#export DH_VERBOSE=1
DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/+.*//')
DEBPKGNAME ?= $(shell dpkg-parsechangelog | grep -E ^Source: | cut -d" " -f2)
PIPELINE ?= $(shell echo '$(DEBPKGNAME)' | sed -e 's/cpl-plugin-//')
include /usr/share/dpkg/pkg-info.mk
VERSION ?= $(shell echo '$(DEB_VERSION)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/+.*//')
PIPELINE ?= $(shell echo '$(DEB_SOURCE)' | sed -e 's/cpl-plugin-//')
get-orig-source:
sh ./debian/repackage.sh
%:
dh $@ --with autoreconf,sphinxdoc
dh $@ --with sphinxdoc
debian_files:
if [ -d calib/cal ] ; then \
......@@ -23,7 +23,7 @@ debian_files:
for f in $$dfiles ; do \
sed "s/__VERSION__/$(VERSION)/g;s/__PIPELINE__/${PIPELINE}/g" \
< debian/cpl-plugin$$f.in \
> debian/${DEBPKGNAME}$$f ; \
> debian/${DEB_SOURCE}$$f ; \
done
override_dh_install: debian_files
......@@ -31,12 +31,12 @@ override_dh_install: debian_files
override_dh_installman-indep:
mkdir -p man
python debian/create_manpage.py ${PIPELINE}
python3 debian/create_manpage.py ${PIPELINE}
dh_installman
override_dh_installdocs-indep:
mkdir -p sphinx
python debian/create_sphinx.py ${PIPELINE}
python3 debian/create_sphinx.py ${PIPELINE}
sphinx-build sphinx sphinx/html
dh_installdocs
......@@ -47,14 +47,14 @@ override_dh_sphinxdoc:
override_dh_clean:
dh_clean
rm -rf debian/${DEBPKGNAME}.install \
debian/${DEBPKGNAME}-doc.manpages \
debian/${DEBPKGNAME}-doc.docs \
debian/${DEBPKGNAME}-doc.doc-base \
debian/${DEBPKGNAME}-calib.lintian-overrides \
debian/${DEBPKGNAME}-calib.install \
debian/${DEBPKGNAME}-calib.postinst \
debian/${DEBPKGNAME}-calib.prerm \
rm -rf debian/${DEB_SOURCE}.install \
debian/${DEB_SOURCE}-doc.manpages \
debian/${DEB_SOURCE}-doc.docs \
debian/${DEB_SOURCE}-doc.doc-base \
debian/${DEB_SOURCE}-calib.lintian-overrides \
debian/${DEB_SOURCE}-calib.install \
debian/${DEB_SOURCE}-calib.postinst \
debian/${DEB_SOURCE}-calib.prerm \
debian/README.Debian \
man sphinx
......@@ -74,7 +74,7 @@ override_dh_installchangelogs:
override_dh_gencontrol-indep:
dh_gencontrol
if [ ! -d calib/cal ] ; then \
sed "s/Installed-Size:.*/Installed-Size: $(shell cat calib/cal_size)/" -i debian/${DEBPKGNAME}-calib/DEBIAN/control ; \
sed "s/Installed-Size:.*/Installed-Size: $(shell cat calib/cal_size)/" -i debian/${DEB_SOURCE}-calib/DEBIAN/control ; \
fi
override_dh_auto_test:
......
Tests: test-recipe.py
Depends: cpl-plugin-visir, python-cpl, python-astropy
Depends: cpl-plugin-visir, python3-cpl, python3-astropy
#!/usr/bin/env python
#!/usr/bin/env python3
#
# Simple pipeline test by loading all recipes and printing some
......
version=3
opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
http://www.eso.org/sci/software/pipelines/ \
https://www.eso.org/sci/software/pipelines/ \
.*/visir-kit-([\d\.]+)(?:-.+)?.tar.gz \
debian debian/repackage.sh
#opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
......