[tryton-debian-vcs] tryton-server branch debian updated. debian/4.6.0-1-2-gaf0ba05
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 13 10:43:34 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-server.git;a=commitdiff;h=debian/4.6.0-1-2-gaf0ba05
commit af0ba05665684ac0adbfcad2fa19d9c713eb91b7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 19:15:11 2017 +0100
Releasing debian version 4.6.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index d449db6..16e9d01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (4.6.1-1) unstable; urgency=medium
+
+ * Merging upstream version 4.6.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 12 Dec 2017 19:15:11 +0100
+
tryton-server (4.6.0-1) unstable; urgency=medium
* Bump the Standards-Version to 4.1.1, no changes needed.
commit 0d76750c65e2f0ec6979c89564cf2336e78f5276
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 19:15:11 2017 +0100
Merging upstream version 4.6.1.
diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index e0bc2f7..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-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 fe9e38c..df74520 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.6.1 - 2017-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.6.0 - 2017-10-30
* Bug fixes (see mercurial logs for details)
* Add support for Python 3.6
diff --git a/PKG-INFO b/PKG-INFO
index 74bce5a..4347157 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 4.6.0
+Version: 4.6.1
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
@@ -65,7 +65,7 @@ Description: trytond
* SQLite
- * SQLite can not alter column definitions nor create foreign keys.
+ * SQLite can not create foreign keys.
* SQL constraints are validated by Tryton instead of database.
diff --git a/README b/README
index 91ae41b..964c7a9 100644
--- a/README
+++ b/README
@@ -56,7 +56,7 @@ backends available. Here are some warnings about using other backends:
* SQLite
- * SQLite can not alter column definitions nor create foreign keys.
+ * SQLite can not create foreign keys.
* SQL constraints are validated by Tryton instead of database.
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index bd4664a..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[tox]
-envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
-
-[testenv]
-commands = {envpython} setup.py test
-deps =
- mock
- {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/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 74bce5a..4347157 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 4.6.0
+Version: 4.6.1
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
@@ -65,7 +65,7 @@ Description: trytond
* SQLite
- * SQLite can not alter column definitions nor create foreign keys.
+ * SQLite can not create foreign keys.
* SQL constraints are validated by Tryton instead of database.
diff --git a/trytond.egg-info/SOURCES.txt b/trytond.egg-info/SOURCES.txt
index b2c0f9e..78e7f03 100644
--- a/trytond.egg-info/SOURCES.txt
+++ b/trytond.egg-info/SOURCES.txt
@@ -1,5 +1,3 @@
-.drone.yml
-.hgtags
CHANGELOG
COPYRIGHT
INSTALL
@@ -7,7 +5,6 @@ LICENSE
MANIFEST.in
README
setup.py
-tox.ini
bin/trytond
bin/trytond-admin
bin/trytond-cron
@@ -74,7 +71,6 @@ trytond/security.py
trytond/sendmail.py
trytond/test_loader.py
trytond/transaction.py
-trytond/tryton.rnc
trytond/url.py
trytond/wsgi.py
trytond.egg-info/PKG-INFO
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 5ef7426..80d083f 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -5,7 +5,7 @@ import time
import warnings
from email import charset
-__version__ = "4.6.0"
+__version__ = "4.6.1"
os.environ['TZ'] = 'UTC'
if hasattr(time, 'tzset'):
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index a92c6ef..2c8949b 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -738,6 +738,7 @@ class ModelView(Model):
del value['remove']
if not value:
continue
+ value = dict(value)
elif field._type == 'many2many':
value = [r.id for r in value]
changed[fname] = value
diff --git a/trytond/tools/misc.py b/trytond/tools/misc.py
index 385b556..cae4a24 100644
--- a/trytond/tools/misc.py
+++ b/trytond/tools/misc.py
@@ -91,11 +91,11 @@ def get_smtp_server():
:return: A SMTP instance. The quit() method must be call when all
the calls to sendmail() have been made.
"""
- from ..sendmail import _get_smtp_server
+ from ..sendmail import get_smtp_server
warnings.warn(
'get_smtp_server is deprecated use trytond.sendmail',
DeprecationWarning)
- return _get_smtp_server()
+ return get_smtp_server()
def memoize(maxsize):
diff --git a/trytond/tryton.rnc b/trytond/tryton.rnc
deleted file mode 100644
index fe87698..0000000
--- a/trytond/tryton.rnc
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-
-tryton = element tryton { attlist.tryton, data* }
-attlist.tryton &= empty
-data = element data { attlist.data, (record | menuitem)* }
-attlist.data &=
- [ a:defaultValue = "0" ] attribute noupdate { "0" | "1" }?
-attlist.data &=
- [ a:defaultValue = "0" ] attribute grouped { "0" | "1" }?
-attlist.data &= attribute depends { text }
-record = element record { attlist.record, field* }
-attlist.record &= attribute model { text }
-attlist.record &= attribute id { text }
-attlist.record &=
- [ a:defaultValue = "0" ] attribute update { "0" | "1" }?
-field = element field { attlist.field, text }
-attlist.field &= attribute name { text }
-attlist.field &= attribute search { text }?
-attlist.field &= attribute ref { text }?
-attlist.field &= attribute eval { text }?
-attlist.field &= attribute pyson { "0" | "1" }?
-attlist.field &= attribute type { "xml" }?
-menuitem = element menuitem { attlist.menuitem, empty }
-attlist.menuitem &= attribute id { text }
-attlist.menuitem &= attribute name { text }?
-attlist.menuitem &= attribute icon { text }?
-attlist.menuitem &= attribute sequence { text }?
-attlist.menuitem &= attribute parent { text }?
-attlist.menuitem &= attribute action { text }?
-attlist.menuitem &= attribute groups { text }?
-attlist.menuitem &= attribute active { text }?
-start = tryton
--
tryton-server
More information about the tryton-debian-vcs
mailing list