[tryton-debian-vcs] tryton-modules-stock-package-shipping branch upstream updated. upstream/4.4.1-1-g9c875ac
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:21:59 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-package-shipping.git;a=commitdiff;h=upstream/4.4.1-1-g9c875ac
commit 9c875acfbfc5ee254f9cd0d3e155c0d3d95b4f37
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:25 2017 +0100
Adding upstream version 4.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
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 4e75480..9639cf5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 4.4.1 - 2017-10-04
+Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
Version 4.4.0 - 2017-05-01
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 aca7bc3..0cd41c5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_package_shipping
-Version: 4.4.1
+Version: 4.6.0
Summary: The package shipping module of the Tryton application platform.
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_package_shipping
==============================
@@ -68,9 +68,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 424afd1..3db20d2 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 30f1af7..3e19446 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 adf18f2..9a0d591 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 ffd9010..6926e8d 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 2ebefff..2fc2768 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 c1c0dd5..56ea86b 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 116f169..4b78807 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -11,7 +11,7 @@ msgid ""
"The shipment \"%(shipment)s\" must be packed before creating the shipping "
"labels"
msgstr ""
-"L’expédition « %(shipment)s » doit être emballé avant de créer les "
+"L’expédition « %(shipment)s » doit être emballée avant de créer les "
"étiquettes de livraison"
msgctxt "field:carrier,shipping_service:"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 56c54c1..c594499 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 e6d8b97..a9b3958 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 02d00d1..a751308 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 4ed5131..92a77a4 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 adf18f2..9a0d591 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 0d71338..eede94f 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 02d00d1..185ac21 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -26,39 +26,39 @@ msgstr ""
msgctxt "field:stock.package.type,height:"
msgid "Height"
-msgstr ""
+msgstr "Wysokość"
msgctxt "field:stock.package.type,height_digits:"
msgid "Height Digits"
-msgstr ""
+msgstr "Cyfry wysokości"
msgctxt "field:stock.package.type,height_uom:"
msgid "Height Unit"
-msgstr ""
+msgstr "Jednostka wysokości"
msgctxt "field:stock.package.type,length:"
msgid "Length"
-msgstr ""
+msgstr "Długość"
msgctxt "field:stock.package.type,length_digits:"
msgid "Length Digits"
-msgstr ""
+msgstr "Cyfry długości"
msgctxt "field:stock.package.type,length_uom:"
msgid "Length Unit"
-msgstr ""
+msgstr "Jednostka długości"
msgctxt "field:stock.package.type,width:"
msgid "Width"
-msgstr ""
+msgstr "Szerokość"
msgctxt "field:stock.package.type,width_digits:"
msgid "Width Digits"
-msgstr ""
+msgstr "Cyfry szerokości"
msgctxt "field:stock.package.type,width_uom:"
msgid "Width Unit"
-msgstr ""
+msgstr "Jednostka szerokości"
msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
@@ -66,11 +66,11 @@ msgstr ""
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
-msgstr "Create Shipping"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_package_shipping_configuration"
msgid "Shipping"
-msgstr "Shipping"
+msgstr ""
msgctxt "selection:carrier,shipping_service:"
msgid ""
@@ -78,7 +78,7 @@ msgstr ""
msgctxt "view:stock.package.type:"
msgid "Dimensions"
-msgstr ""
+msgstr "Wymiary"
msgctxt "view:stock.shipment.out:"
msgid "Create Shipping for Packages"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 9d8bb48..bb6b002 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 1bca666..847e33b 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 6947753..426dae7 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 62abfc3..36dbbc1 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.py b/setup.py
index 5423577..377c1fa 100644
--- a/setup.py
+++ b/setup.py
@@ -76,7 +76,7 @@ setup(name=name,
],
package_data={
'trytond.modules.stock_package_shipping': (info.get('xml', [])
- + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
'icons/*.svg', 'tests/*.rst']),
},
classifiers=[
@@ -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/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 3a078f9..03ee270 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.1
+version=4.6.0
depends:
ir
res
diff --git a/trytond_stock_package_shipping.egg-info/PKG-INFO b/trytond_stock_package_shipping.egg-info/PKG-INFO
index e030f30..656a8cb 100644
--- a/trytond_stock_package_shipping.egg-info/PKG-INFO
+++ b/trytond_stock_package_shipping.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-package-shipping
-Version: 4.4.1
+Version: 4.6.0
Summary: The package shipping module of the Tryton application platform.
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_package_shipping
==============================
@@ -68,9 +68,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_package_shipping.egg-info/SOURCES.txt b/trytond_stock_package_shipping.egg-info/SOURCES.txt
index ae15ec3..28316b2 100644
--- a/trytond_stock_package_shipping.egg-info/SOURCES.txt
+++ b/trytond_stock_package_shipping.egg-info/SOURCES.txt
@@ -1,12 +1,18 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+carrier.py
carrier.xml
setup.py
+stock.py
stock.xml
+tox.ini
tryton.cfg
./__init__.py
./carrier.py
@@ -59,6 +65,8 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/test_shipping.py
trytond_stock_package_shipping.egg-info/PKG-INFO
trytond_stock_package_shipping.egg-info/SOURCES.txt
trytond_stock_package_shipping.egg-info/dependency_links.txt
diff --git a/trytond_stock_package_shipping.egg-info/requires.txt b/trytond_stock_package_shipping.egg-info/requires.txt
index 4c6f23a..6782afe 100644
--- a/trytond_stock_package_shipping.egg-info/requires.txt
+++ b/trytond_stock_package_shipping.egg-info/requires.txt
@@ -1,8 +1,8 @@
-trytond_carrier >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond_stock_package >= 4.4, < 4.5
-trytond_stock_shipment_measurements >= 4.4, < 4.5
-trytond_sale_shipment_cost >= 4.4, < 4.5
-trytond_product_measurements >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_carrier >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond_stock_package >= 4.6, < 4.7
+trytond_stock_shipment_measurements >= 4.6, < 4.7
+trytond_sale_shipment_cost >= 4.6, < 4.7
+trytond_product_measurements >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
--
tryton-modules-stock-package-shipping
More information about the tryton-debian-vcs
mailing list