From ea2272bd3fcc3699251827dd84fdfc82cbfde4d0 Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Tue, 21 Jun 2016 17:22:07 +0200
Subject: [PATCH] Backed out changeset c831b1968344

---
 .drone.yml                        |  9 ---------
 configuration.xml                 |  1 +
 setup.py                          |  6 +-----
 tests/test_party_country.py       | 23 +++++++++++++++++------
 tox.ini                           | 17 -----------------
 tryton.cfg                        |  2 +-
 view/party_configuration_form.xml |  2 +-
 7 files changed, 21 insertions(+), 39 deletions(-)
 delete mode 100644 .drone.yml
 delete mode 100644 tox.ini

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index c4fd423..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/configuration.xml b/configuration.xml
index 6d03c72..fb747ab 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -5,6 +5,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     <data>
         <record model="ir.ui.view" id="party_configuration_view_form">
             <field name="model">party.configuration</field>
+            <field name="type">form</field>
             <field name="inherit" ref="party.party_configuration_view_form"/>
             <field name="name">party_configuration_form</field>
         </record>
diff --git a/setup.py b/setup.py
index 0bb97bc..c4a692f 100644
--- a/setup.py
+++ b/setup.py
@@ -66,12 +66,8 @@ setup(name='%s_%s' % (PREFIX, MODULE),
         'Natural Language :: Catalan',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
         ],
     license='GPL-3',
diff --git a/tests/test_party_country.py b/tests/test_party_country.py
index 56cacfb..182e3e8 100644
--- a/tests/test_party_country.py
+++ b/tests/test_party_country.py
@@ -1,17 +1,28 @@
-# The COPYRIGHT file at the top level of this repository contains
-# the full copyright notices and license terms.
+#This file is part party_country module for Tryton.
+#The COPYRIGHT file at the top level of this repository contains 
+#the full copyright notices and license terms.
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import test_view, test_depends
 
 
-class PartyCountryTestCase(ModuleTestCase):
+class PartyCountryTestCase(unittest.TestCase):
     '''Test Party Country module.'''
-    module = 'party_country'
+
+    def setUp(self):
+        trytond.tests.test_tryton.install_module('party_country')
+
+    def test0005views(self):
+        '''Test views'''
+        test_view('party_country')
+
+    def test0006depends(self):
+        '''Test depends'''
+        test_depends()
 
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-        PartyCountryTestCase))
+        CountryZipTestCase))
     return suite
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 3dda9ab..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[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
-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 e5385b4..9c7e2bd 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.1.0
+version=3.4.0
 depends:
     party
     country
diff --git a/view/party_configuration_form.xml b/view/party_configuration_form.xml
index 876006f..f428ed3 100644
--- a/view/party_configuration_form.xml
+++ b/view/party_configuration_form.xml
@@ -2,7 +2,7 @@
 <!-- This file is part party_country module for Tryton.
 The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form" position="inside">
+    <xpath expr="/form/field[@name='party_lang']" position="after">
         <label name="default_country"/>
         <field name="default_country"/>
     </xpath>