Backed out changeset c831b1968344

This commit is contained in:
Sergi Almacellas Abellana 2016-06-21 17:22:07 +02:00
parent c84f301b3f
commit ea2272bd3f
7 changed files with 21 additions and 39 deletions

View File

@ -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

View File

@ -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>

View File

@ -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',

View File

@ -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

17
tox.ini
View File

@ -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}

View File

@ -1,5 +1,5 @@
[tryton]
version=4.1.0
version=3.4.0
depends:
party
country

View File

@ -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>