[tryton-debian-vcs] tryton-modules-product branch debian-stretch-4.2 updated. debian/4.2.1-1-7-g069f98d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Nov 12 16:32:30 UTC 2017
The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product.git;a=commitdiff;h=debian/4.2.1-1-7-g069f98d
commit 069f98d8ae001fc109d21bf30bb99841e6dafdb6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 13:27:16 2017 +0100
Releasing debian version 4.2.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 9a7ac58..d3caefb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-product (4.2.2-1) unstable; urgency=medium
+
+ * Add the actual upstream maintainer key to signing-key.asc.
+ * Setting the branch in the watch file to the fixed version 4.2.
+ * Use the preferred https URL format in the copyright file.
+ * Bump the Standards-Version to 4.0.1.
+ * Merging upstream version 4.2.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 11 Nov 2017 13:27:16 +0100
+
tryton-modules-product (4.2.1-1) unstable; urgency=medium
* Merging upstream version 4.2.1.
commit 2f72b21bfad7f960f50c45f960ac2d2d7e8856dd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 13:27:16 2017 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 2ad8183..7ae2ad8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2016 Cédric Krier
+Copyright: 2008-2017 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2016 B2CK SPRL
+ 2008-2017 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit a2adf20e7eab391890b4da7bd494e891f15430b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 13:27:16 2017 +0100
Merging upstream version 4.2.2.
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..c4fd423
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,9 @@
+image: python:all
+env:
+ - POSTGRESQL_URI=postgresql://postgres@127.0.0.1:5432/
+ - MYSQL_URI=mysql://root@127.0.0.1:3306/
+script:
+ - pip install tox
+ - tox -e "{py27,py33,py34,py35}-{sqlite,postgresql}" --skip-missing-interpreters
+services:
+ - postgres
diff --git a/CHANGELOG b/CHANGELOG
index 0e3441d..f000055 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.2 - 2017-11-08
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.1 - 2017-01-03
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 48f96af..dba4452 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index b36f214..0336215 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product
-Version: 4.2.1
+Version: 4.2.2
Summary: Tryton module with products
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index 8a96f7f..5b258d8 100644
--- a/product.py
+++ b/product.py
@@ -122,7 +122,8 @@ class Template(ModelSQL, ModelView):
@classmethod
def search_default_uom_category(cls, name, clause):
- return [('default_uom.category',) + tuple(clause[1:])]
+ return [('default_uom.category' + clause[0].lstrip(name),)
+ + tuple(clause[1:])]
@classmethod
def create(cls, vlist):
@@ -237,7 +238,7 @@ class Product(ModelSQL, ModelView):
@classmethod
def search_template(cls, name, clause):
- return [('template.%s' % name,) + tuple(clause[1:])]
+ return [('template.' + clause[0],) + tuple(clause[1:])]
@classmethod
def order_rec_name(cls, tables):
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..08e43cf
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py33,py34,py35}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index fabf0e6..e468c61 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.1
+version=4.2.2
depends:
ir
res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index b242f01..b980977 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-product
-Version: 4.2.1
+Version: 4.2.2
Summary: Tryton module with products
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_product.egg-info/SOURCES.txt b/trytond_product.egg-info/SOURCES.txt
index 770e979..71f58fb 100644
--- a/trytond_product.egg-info/SOURCES.txt
+++ b/trytond_product.egg-info/SOURCES.txt
@@ -1,14 +1,22 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+category.py
category.xml
+configuration.py
configuration.xml
+product.py
product.xml
setup.py
+tox.ini
tryton.cfg
+uom.py
uom.xml
./__init__.py
./category.py
@@ -75,6 +83,8 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/test_product.py
trytond_product.egg-info/PKG-INFO
trytond_product.egg-info/SOURCES.txt
trytond_product.egg-info/dependency_links.txt
--
tryton-modules-product
More information about the tryton-debian-vcs
mailing list