Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ RUN apt-get update -qq -o Acquire::Languages=none \
&& env DEBIAN_FRONTEND=noninteractive apt-get install \
-yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io \
build-essential debhelper devscripts equivs lsb-release libparse-debianchangelog-perl \
python python-setuptools python-pip python-dev \
python-sphinx python-mock dh-exec dh-python python-sphinx-rtd-theme \
python3 python3-setuptools python3-pip python3-dev \
python3-sphinx python3-mock dh-exec dh-python python3-sphinx-rtd-theme \
&& apt-get clean && rm -rf "/var/lib/apt/lists"/*
WORKDIR /dpkg-build
COPY ./ ./
Expand Down
7 changes: 2 additions & 5 deletions bin/dh_virtualenv
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@ import logging
import os
import sys

# The debpython resides here
sys.path.insert(1, '/usr/share/python/')

from debpython.debhelper import DebHelper
from dh_virtualenv import Deployment
from dh_virtualenv.cmdline import get_default_parser
from dh_virtualenv.debhelper import DebHelper
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, maybe I should have vendored this in earlier, the sys path trickery has always been... not so nice, and this is so much cleaner 👍


logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: '
'%(message)s')
Expand All @@ -38,7 +35,7 @@ log = logging.getLogger(__name__)
def _shell_vars(**kwargs):
"""Convert the given values into the equivalent shell snippet defining them."""
return '\n'.join("dh_venv_{0}='{1}'".format(k, v.replace("'", r"'\''"))
for k, v in sorted(kwargs.iteritems()))
for k, v in sorted(kwargs.items()))
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm honestly baffled that there isn't more python2-isms in this code 😁



def main():
Expand Down
8 changes: 4 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ Source: dh-virtualenv
Section: python
Priority: optional
Maintainer: Jyrki Pulliainen <jyrki@spotify.com>
Build-Depends: debhelper (>= 9), python(>= 2.6.6-3~),
python-setuptools, python-sphinx, python-mock, dh-exec, dh-python,
Build-Depends: debhelper (>= 9), python3,
python3-setuptools, python3-sphinx, python3-mock, dh-exec, dh-python,
# python-sphinx-rtd-theme doesn't exist in distributions
# predating Debian Jessie and Ubuntu Xenial. On these legacy
# systems:
# 1. Comment the dependency below.
# 2. pip install sphinx_rtd_theme.
# 3. Proceed with your build process (typically dpkg-build).
# See https://github.com/spotify/dh-virtualenv/issues/230
python-sphinx-rtd-theme
python3-sphinx-rtd-theme
Standards-Version: 4.2.1
Homepage: http://www.github.com/spotify/dh-virtualenv

Package: dh-virtualenv
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, ${sphinxdoc:Depends},
Depends: ${python3:Depends}, ${misc:Depends}, ${sphinxdoc:Depends},
virtualenv | python-virtualenv (>= 1.7) | python3-venv
Description: wrap and build python packages using virtualenv
This package provides a dh sequencer that helps you to deploy your
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
endif

%:
dh $@ --with python2 $(DH_ARGS)
dh $@ --buildsystem=pybuild --with python3 $(DH_ARGS)

override_dh_auto_clean:
rm -rf doc/_build
Expand All @@ -20,7 +20,7 @@ override_dh_auto_build:

ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
override_dh_installdocs:
python setup.py build_sphinx
python3 setup.py build_sphinx
dh_installdocs doc/_build/html

# Make Sphinxdocs build on Jessie and Xenial
Expand Down
210 changes: 210 additions & 0 deletions dh_virtualenv/debhelper.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
# -*- coding: UTF-8 -*-
# Copyright © 2010-2012 Piotr Ożarowski <piotr@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

import logging
from os import makedirs, chmod
from os.path import exists, join, dirname

log = logging.getLogger(__name__)


class DebHelper(object):
"""Reinvents the wheel / some dh functionality (Perl is ugly ;-P)"""

def __init__(self, options):
self.options = options
self.packages = {}
self.python_version = None
source_section = True
binary_package = None

pkgs = options.package
skip_pkgs = options.no_package

try:
fp = open('debian/control', 'r')
except IOError:
raise Exception('cannot find debian/control file')

xspv = xpv = False
for line in fp:
if not line.strip():
source_section = False
binary_package = None
continue
if binary_package:
if binary_package.startswith('python3'):
continue
if pkgs and binary_package not in pkgs:
continue
if skip_pkgs and binary_package in skip_pkgs:
continue
if line.startswith('Architecture:'):
arch = line[13:].strip()
# TODO: if arch doesn't match current architecture:
#del self.packages[binary_package]
self.packages[binary_package]['arch'] = arch
continue
elif line.startswith('Package:'):
binary_package = line[8:].strip()
if binary_package.startswith('python3'):
log.debug('skipping Python 3.X package: %s', binary_package)
continue
if pkgs and binary_package not in pkgs:
continue
if skip_pkgs and binary_package in skip_pkgs:
continue
self.packages[binary_package] = {'substvars': {},
'autoscripts': {},
'rtupdates': [],
'arch': 'any'}
elif line.startswith('Source:'):
self.source_name = line[7:].strip()
elif source_section:
if line.lower().startswith('xs-python-version:'):
xspv = True
if not self.python_version:
self.python_version = line[18:].strip()
if line.lower().startswith('x-python-version:'):
xpv = True
self.python_version = line[17:].strip()

if xspv and xpv:
log.error('Please remove XS-Python-Version from debian/control')

log.debug('source=%s, binary packages=%s', self.source_name, \
self.packages.keys())

def addsubstvar(self, package, name, value):
"""debhelper's addsubstvar"""
self.packages[package]['substvars'].setdefault(name, []).append(value)

def autoscript(self, package, when, template, args):
"""debhelper's autoscript"""
self.packages[package]['autoscripts'].setdefault(when, {})\
.setdefault(template, []).append(args)

def add_rtupdate(self, package, value):
self.packages[package]['rtupdates'].append(value)

def save_autoscripts(self):
for package, settings in self.packages.items():
autoscripts = settings.get('autoscripts')
if not autoscripts:
continue

for when, templates in autoscripts.items():
fn = "debian/%s.%s.debhelper" % (package, when)
if exists(fn):
data = open(fn, 'r').read()
else:
data = ''

new_data = ''
for tpl_name, args in templates.items():
for i in args:
# try local one first (useful while testing dh_python2)
fpath = join(dirname(__file__), '..',
"autoscripts/%s" % tpl_name)
if not exists(fpath):
fpath = "/usr/share/debhelper/autoscripts/%s" % tpl_name
tpl = open(fpath, 'r').read()
if self.options.compile_all and args:
# TODO: should args be checked to contain dir name?
tpl = tpl.replace('#PACKAGE#', '')
else:
tpl = tpl.replace('#PACKAGE#', package)
tpl = tpl.replace('#ARGS#', i)
if tpl not in data and tpl not in new_data:
new_data += "\n%s" % tpl
if new_data:
data += "\n# Automatically added by dh_python2:" +\
"%s\n# End automatically added section\n" % new_data
fp = open(fn, 'w')
fp.write(data)
fp.close()

def save_substvars(self):
for package, settings in self.packages.items():
substvars = settings.get('substvars')
if not substvars:
continue
fn = "debian/%s.substvars" % package
if exists(fn):
data = open(fn, 'r').read()
else:
data = ''
for name, values in substvars.items():
p = data.find("%s=" % name)
if p > -1: # parse the line and remove it from data
e = data[p:].find('\n')
line = data[p + len("%s=" % name):\
p + e if e > -1 else None]
items = [i.strip() for i in line.split(',') if i]
if e > -1 and data[p + e:].strip():
data = "%s\n%s" % (data[:p], data[p + e:])
else:
data = data[:p]
else:
items = []
for j in values:
if j not in items:
items.append(j)
if items:
if data:
data += '\n'
data += "%s=%s\n" % (name, ', '.join(items))
data = data.replace('\n\n', '\n')
if data:
fp = open(fn, 'w')
fp.write(data)
fp.close()

def save_rtupdate(self):
for package, settings in self.packages.items():
pkg_arg = '' if self.options.compile_all else "-p %s" % package
values = settings.get('rtupdates')
if not values:
continue
d = "debian/%s/usr/share/python/runtime.d" % package
if not exists(d):
makedirs(d)
fn = "%s/%s.rtupdate" % (d, package)
if exists(fn):
data = open(fn, 'r').read()
else:
data = "#! /bin/sh\nset -e"
for dname, args in values:
cmd = 'if [ "$1" = rtupdate ]; then' +\
"\n\tpyclean %s %s" % (pkg_arg, dname) +\
"\n\tpycompile %s %s %s\nfi" % (pkg_arg, args, dname)
if cmd not in data:
data += "\n%s" % cmd
if data:
fp = open(fn, 'w')
fp.write(data)
fp.close()
chmod(fn, 0o755)

def save(self):
self.save_substvars()
self.save_autoscripts()
self.save_rtupdate()