[tryton-debian-vcs] tryton-modules-account-stock-landed-cost-weight branch debian updated. debian/4.4.0-4-5-g216866b

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:08:21 UTC 2017


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-stock-landed-cost-weight.git;a=commitdiff;h=debian/4.4.0-4-5-g216866b

commit 216866bb588c35277e41a15e2f61bdec0224c919
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 7 16:24:40 2017 +0100

    Releasing debian version 4.6.0-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index bf35d74..b5ada01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-stock-landed-cost-weight (4.6.0-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.
+  * Merging upstream version 4.6.0.
+  * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 07 Nov 2017 10:19:58 +0100
+
 tryton-modules-account-stock-landed-cost-weight (4.4.0-4) unstable; urgency=medium
 
   * Switch to Python3.
commit 6f0558562f38abeecdb30fb122f5ff103286080c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 7 10:16:46 2017 +0100

    Use https in the watch file.

diff --git a/debian/watch b/debian/watch
index f91b65a..bab7602 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_account_stock_landed_cost_weight-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_account_stock_landed_cost_weight-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit f76267601cb5a9d43dbda83a9319551d9ffb78cb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 6 14:40:34 2017 +0100

    Merging upstream version 4.6.0.

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+    hg:
+        image: plugins/hg
+
+pipeline:
+    tox:
+        image: ${IMAGE}
+        environment:
+            - CFLAGS=-O0
+            - DB_CACHE=/cache
+            - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+            - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+        commands:
+            - pip install tox
+            - tox -e "${TOXENV}-${DATABASE}"
+        volumes:
+            - cache:/root/.cache
+
+services:
+    postgresql:
+        image: postgres
+        when:
+            matrix:
+                DATABASE: postgresql
+
+matrix:
+    include:
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: sqlite
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: postgresql
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: sqlite
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: postgresql
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: sqlite
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: postgresql
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: sqlite
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index 06cff4e..08e7d98 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.6.0 - 2017-10-30
+* 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 c3aaaa5..1e0edcc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_account_stock_landed_cost_weight
-Version: 4.4.0
+Version: 4.6.0
 Summary: Tryton module for landed cost per weight
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_account_stock_landed_cost_weight
         ========================================
         
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/locale/bg.po b/locale/bg.po
index e0d1c14..3cf00a0 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/ca.po b/locale/ca.po
index 235ecd7..a572fc7 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/cs.po b/locale/cs.po
index e0d1c14..3cf00a0 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/de.po b/locale/de.po
index 138fe2e..0a77b1a 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/es.po b/locale/es.po
index 8afb3f6..f32df2b 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/es_419.po b/locale/es_419.po
index e0d1c14..3cf00a0 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/fr.po b/locale/fr.po
index 69891c3..5c2ba1d 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index e0d1c14..3cf00a0 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 3e1bc9f..c7f5c40 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index e0d1c14..3cf00a0 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/lo.po b/locale/lo.po
index 631e317..3489148 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/lt.po b/locale/lt.po
index e0d1c14..3cf00a0 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/nl.po b/locale/nl.po
index e0d1c14..3cf00a0 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/pl.po b/locale/pl.po
index a4226fe..1ed4256 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index d2a05bf..bcdfe08 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/ru.po b/locale/ru.po
index e0d1c14..3cf00a0 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/sl.po b/locale/sl.po
index 33d714b..e46bf6a 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 4824246..2bf2157 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
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/setup.py b/setup.py
index 98a7196..a041850 100644
--- a/setup.py
+++ b/setup.py
@@ -103,9 +103,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
diff --git a/tests/scenario_account_stock_landed_cost_weight.rst b/tests/scenario_account_stock_landed_cost_weight.rst
index e9419e8..70bd942 100644
--- a/tests/scenario_account_stock_landed_cost_weight.rst
+++ b/tests/scenario_account_stock_landed_cost_weight.rst
@@ -51,55 +51,51 @@ Create products::
 
     >>> ProductUom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
-    >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
     >>> kg, = ProductUom.find([('name', '=', 'Kilogram')])
 
-    >>> product1 = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('300')
-    >>> template.cost_price = Decimal('80')
     >>> template.cost_price_method = 'average'
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
     >>> template.weight_uom = kg
     >>> template.weight = 20
+    >>> product1, = template.products
+    >>> product1.cost_price = Decimal('80')
     >>> template.save()
-    >>> product1.template = template
-    >>> product1.save()
+    >>> product1, = template.products
 
-    >>> product2 = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('200')
-    >>> template.cost_price = Decimal('50')
     >>> template.cost_price_method = 'average'
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
     >>> template.weight_uom = kg
     >>> template.weight = 10
+    >>> product2, = template.products
+    >>> product2.cost_price = Decimal('50')
     >>> template.save()
-    >>> product2.template = template
-    >>> product2.save()
+    >>> product2, = template.products
 
-    >>> product_landed_cost = Product()
     >>> template = ProductTemplate()
     >>> template.name = 'Landed Cost'
     >>> template.default_uom = unit
     >>> template.type = 'service'
     >>> template.landed_cost = True
     >>> template.list_price = Decimal('10')
-    >>> template.cost_price = Decimal('10')
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
+    >>> product_landed_cost, = template.products
+    >>> product_landed_cost.cost_price = Decimal('10')
     >>> template.save()
-    >>> product_landed_cost.template = template
-    >>> product_landed_cost.save()
+    >>> product_landed_cost, = template.products
 
 Get stock locations::
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    {py27,py34,py35,py36}-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 b3aa471..8a0a95b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.0
+version=4.6.0
 depends:
     account_stock_landed_cost
     ir
diff --git a/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO b/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO
index a49bc90..5827b56 100644
--- a/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO
+++ b/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-account-stock-landed-cost-weight
-Version: 4.4.0
+Version: 4.6.0
 Summary: Tryton module for landed cost per weight
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_account_stock_landed_cost_weight
         ========================================
         
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_account_stock_landed_cost_weight.egg-info/SOURCES.txt b/trytond_account_stock_landed_cost_weight.egg-info/SOURCES.txt
index bb0894f..143ef5c 100644
--- a/trytond_account_stock_landed_cost_weight.egg-info/SOURCES.txt
+++ b/trytond_account_stock_landed_cost_weight.egg-info/SOURCES.txt
@@ -1,10 +1,15 @@
+.drone.yml
+.hgtags
 CHANGELOG
 COPYRIGHT
 INSTALL
 LICENSE
 MANIFEST.in
 README
+__init__.py
+account.py
 setup.py
+tox.ini
 tryton.cfg
 ./__init__.py
 ./account.py
@@ -49,7 +54,9 @@ locale/pt_BR.po
 locale/ru.po
 locale/sl.po
 locale/zh_CN.po
+tests/__init__.py
 tests/scenario_account_stock_landed_cost_weight.rst
+tests/test_account_stock_landed_cost_weight.py
 trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO
 trytond_account_stock_landed_cost_weight.egg-info/SOURCES.txt
 trytond_account_stock_landed_cost_weight.egg-info/dependency_links.txt
diff --git a/trytond_account_stock_landed_cost_weight.egg-info/requires.txt b/trytond_account_stock_landed_cost_weight.egg-info/requires.txt
index 87600bf..3e56204 100644
--- a/trytond_account_stock_landed_cost_weight.egg-info/requires.txt
+++ b/trytond_account_stock_landed_cost_weight.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_account_stock_landed_cost >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond_product_measurements >= 4.4, < 4.5
-trytond_stock_shipment_measurements >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_account_stock_landed_cost >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond_product_measurements >= 4.6, < 4.7
+trytond_stock_shipment_measurements >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
-- 
tryton-modules-account-stock-landed-cost-weight



More information about the tryton-debian-vcs mailing list