[Merge] ~chris.macnaughton/ubuntu/+source/python-sqlalchemy-utils:master into ~ubuntu-server-dev/ubuntu/+source/python-sqlalchemy-utils:master

[Corey Bryant]

Diff comments:

> diff --git a/debian/patches/disable-dateutil-tests.patch b/debian/patches/disable-dateutil-tests.patch
> new file mode 100644
> index 0000000..a141fa5
> --- /dev/null
> +++ b/debian/patches/disable-dateutil-tests.patch
> @@ -0,0 +1,38 @@
> +Description: python-dateutil is broken without a timezone gzip.
> +Bug: #1887664 

Would be nice to have a full URL to the bug and your name. Btw here are some documented patch headers: https://packaging.ubuntu.com/html/patches-to-packages.html#patch-headers

> +---
> +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
> +--- a/tests/types/test_timezone.py
> ++++ b/tests/types/test_timezone.py
> +@@ -11,9 +11,6 @@ def Visitor(Base):
> +     class Visitor(Base):
> +         __tablename__ = 'visitor'
> +         id = sa.Column(sa.Integer, primary_key=True)
> +-        timezone_dateutil = sa.Column(
> +-            timezone.TimezoneType(backend='dateutil')
> +-        )
> +         timezone_pytz = sa.Column(
> +             timezone.TimezoneType(backend='pytz')
> +         )
> +@@ -32,21 +29,16 @@ class TestTimezoneType(object):
> + 
> +     def test_parameter_processing(self, session, Visitor):
> +         visitor = Visitor(
> +-            timezone_dateutil=u'America/Los_Angeles',
> +             timezone_pytz=u'America/Los_Angeles'
> +         )
> + 
> +         session.add(visitor)
> +         session.commit()
> + 
> +-        visitor_dateutil = session.query(Visitor).filter_by(
> +-            timezone_dateutil=u'America/Los_Angeles'
> +-        ).first()
> +         visitor_pytz = session.query(Visitor).filter_by(
> +             timezone_pytz=u'America/Los_Angeles'
> +         ).first()
> + 
> +-        assert visitor_dateutil is not None
> +         assert visitor_pytz is not None
> + 
> + 
> diff --git a/debian/tests/control b/debian/tests/control
> new file mode 100644
> index 0000000..4133b92
> --- /dev/null
> +++ b/debian/tests/control
> @@ -0,0 +1,20 @@
> +Tests: python-sqlalchemy-utils
> +Depends:
> + mysql-server,
> + postgresql-all,
> + python3-colour,
> + python3-cryptography,
> + python3-infinity,
> + python3-intervals,
> + python3-sqlalchemy-utils,
> + python3-pytest,
> + python3-flexmock,
> + python3-mock,
> + python3-phonenumbers,
> + python3-psycopg2,
> + python3-pg,
> + python3-pymysql,
> + python3-pg8000,
> + python3-tz,
> +Restrictions: needs-root, allow-stderr
> +

Not required but you can reduce the Depends list with something like (see python-oslo.db for example):
Depends: @, @builddeps@, ...



-- 
https://code.launchpad.net/~chris.macnaughton/ubuntu/+source/python-sqlalchemy-utils/+git/python-sqlalchemy-utils/+merge/386651
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/python-sqlalchemy-utils:master.