[tryton-debian-vcs] tryton-modules-stock-shipment-measurements branch debian updated. debian/4.4.0-4-6-g8171e17
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:22:33 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-stock-shipment-measurements.git;a=commitdiff;h=debian/4.4.0-4-6-g8171e17
commit 8171e1757de2ca7716535f8088d511ad758cb945
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Nov 7 16:25:03 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 beb1cd3..65ba60f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-stock-shipment-measurements (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.
+ * Updating debian/copyright.
+ * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 07 Nov 2017 10:20:42 +0100
+
tryton-modules-stock-shipment-measurements (4.4.0-4) unstable; urgency=medium
* Switch to Python3.
commit f560daee99a3ab955590e1e8283a8f5288d82517
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 7127318..28ecd76 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_stock_shipment_measurements-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_stock_shipment_measurements-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
commit 8db117efe9186118a7cba5a01740231814b8902e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:50:32 2017 +0100
Updating debian/copyright.
diff --git a/debian/copyright b/debian/copyright
index 3db156c..fe6b056 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2017 Cédric Krier
- 2017 B2CK SPRL
+ 2017 B2CK
License: GPL-3+
Files: debian/*
commit 1e8586dc37b82d96e4c5cb5c0facb1bd310e0cbb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:28 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 0a5a1c7..84730c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.0 - 2017-05-01
* Initial release
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index fb91042..4a5843d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
+include *.fodt
include locale/*.po
include doc/*
include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index f7faba7..507bc5f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_shipment_measurements
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add measurements to shipment
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_stock_shipment_measurements
===================================
@@ -67,9 +67,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 57bcde4..e14cdb3 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 c912dcf..4040765 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 57bcde4..e14cdb3 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 3f27620..23c88ca 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 2f9c5bf..d20ec71 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 57bcde4..e14cdb3 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 523b2cd..1059b1b 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 57bcde4..e14cdb3 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 57bcde4..e14cdb3 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 57bcde4..e14cdb3 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 57bcde4..e14cdb3 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 57bcde4..e14cdb3 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 57bcde4..e14cdb3 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 57bcde4..e14cdb3 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 c3110d7..2005ec9 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 57bcde4..e14cdb3 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 722c698..54e6bc7 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 57bcde4..e14cdb3 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 975d75e..2f99036 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(name=name,
],
package_data={
'trytond.modules.stock_shipment_measurements': (info.get('xml', [])
- + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
'icons/*.svg', 'tests/*.rst']),
},
classifiers=[
@@ -101,9 +101,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/test_stock_shipment_measurements.py b/tests/test_stock_shipment_measurements.py
index c5d70ec..9af65e5 100644
--- a/tests/test_stock_shipment_measurements.py
+++ b/tests/test_stock_shipment_measurements.py
@@ -44,8 +44,6 @@ class StockShipmentMeasurementsTestCase(ModuleTestCase):
'name': "Test internal measurements",
'type': 'goods',
'list_price': Decimal(1),
- 'cost_price': Decimal(0),
- 'cost_price_method': 'fixed',
'default_uom': kg,
}])
product, = Product.create([{
@@ -147,8 +145,6 @@ class StockShipmentMeasurementsTestCase(ModuleTestCase):
'name': "Test measurements",
'type': 'goods',
'list_price': Decimal(1),
- 'cost_price': Decimal(0),
- 'cost_price_method': 'fixed',
'default_uom': kg,
'volume': 0.2,
'volume_uom': liter,
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 e83db35..1c6e881 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.6.0
depends:
ir
product
diff --git a/trytond_stock_shipment_measurements.egg-info/PKG-INFO b/trytond_stock_shipment_measurements.egg-info/PKG-INFO
index 8a6bb9b..b0cfaec 100644
--- a/trytond_stock_shipment_measurements.egg-info/PKG-INFO
+++ b/trytond_stock_shipment_measurements.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-shipment-measurements
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add measurements to shipment
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_stock_shipment_measurements
===================================
@@ -67,9 +67,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_stock_shipment_measurements.egg-info/SOURCES.txt b/trytond_stock_shipment_measurements.egg-info/SOURCES.txt
index b72adb1..c56e6a9 100644
--- a/trytond_stock_shipment_measurements.egg-info/SOURCES.txt
+++ b/trytond_stock_shipment_measurements.egg-info/SOURCES.txt
@@ -1,11 +1,16 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
setup.py
+stock.py
stock.xml
+tox.ini
tryton.cfg
./__init__.py
./stock.py
@@ -54,6 +59,8 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/test_stock_shipment_measurements.py
trytond_stock_shipment_measurements.egg-info/PKG-INFO
trytond_stock_shipment_measurements.egg-info/SOURCES.txt
trytond_stock_shipment_measurements.egg-info/dependency_links.txt
diff --git a/trytond_stock_shipment_measurements.egg-info/requires.txt b/trytond_stock_shipment_measurements.egg-info/requires.txt
index 7f91f1f..c7c97f1 100644
--- a/trytond_stock_shipment_measurements.egg-info/requires.txt
+++ b/trytond_stock_shipment_measurements.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_product >= 4.4, < 4.5
-trytond_product_measurements >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_product >= 4.6, < 4.7
+trytond_product_measurements >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
--
tryton-modules-stock-shipment-measurements
More information about the tryton-debian-vcs
mailing list