[tryton-debian-vcs] tryton-modules-analytic-purchase branch debian-stretch-4.4 created. debian/4.4.1-1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 15 09:37:47 UTC 2017
The following commit has been merged in the debian-stretch-4.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-purchase.git;a=commitdiff;h=debian/4.4.1-1
commit 83e81b767e821bf036a3638685460aa2c16b6367
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 14:45:43 2017 +0100
Releasing debian version 4.4.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 7af9a72..fd5f872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-analytic-purchase (4.4.1-1) unstable; urgency=medium
+
+ * Bump the Standards-Version to 4.1.0, no changes needed.
+ * Bump the Standards-Version to 4.1.1, no changes needed.
+ * Setting the branch in the watch file to the fixed version 4.4.
+ * Merging upstream version 4.4.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 11 Nov 2017 14:45:43 +0100
+
tryton-modules-analytic-purchase (4.4.0-4) unstable; urgency=medium
* Switch to Python3.
commit b1bb1317710547f88535ff50c07bcc700cf380d5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 14:45:43 2017 +0100
Merging upstream version 4.4.1.
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 96ecf9d..0d2214b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.1 - 2017-11-08
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3082e0b..6dd6c5e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_analytic_purchase
-Version: 4.4.0
+Version: 4.4.1
Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index ef62c51..94c8841 100644
--- a/purchase.py
+++ b/purchase.py
@@ -111,6 +111,6 @@ class AnalyticAccountEntry:
domain = super(AnalyticAccountEntry, cls).search_company(name, clause)
return ['OR',
domain,
- (('origin.purchase.company',) + tuple(clause[1:])
- + ('purchase.line',)),
+ (('origin.purchase.' + clause[0],) + tuple(clause[1:3])
+ + ('purchase.line',) + tuple(clause[3:])),
]
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 27ac8d7..2f45114 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.4.1
depends:
analytic_account
analytic_invoice
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 0124a26..6dbae07 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-analytic-purchase
-Version: 4.4.0
+Version: 4.4.1
Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index e3c4f0a..050d4d8 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -1,11 +1,16 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+purchase.py
purchase.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
./purchase.py
@@ -51,6 +56,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/scenario_analytic_purchase.rst
+tests/test_analytic_purchase.py
trytond_analytic_purchase.egg-info/PKG-INFO
trytond_analytic_purchase.egg-info/SOURCES.txt
trytond_analytic_purchase.egg-info/dependency_links.txt
commit 6510ee7ff42041c793dc94b2252408b009af447e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 12:26:10 2017 +0100
Setting the branch in the watch file to the fixed version 4.4.
diff --git a/debian/watch b/debian/watch
index 19462aa..1c937c9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_analytic_purchase-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/4.4/ .*trytond_analytic_purchase-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-analytic-purchase
More information about the tryton-debian-vcs
mailing list