diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..9f91ecb --- /dev/null +++ b/.drone.yml @@ -0,0 +1,49 @@ +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}" + +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/__init__.py b/__init__.py index e583224..16c85e2 100644 --- a/__init__.py +++ b/__init__.py @@ -1,12 +1,12 @@ -#The COPYRIGHT file at the top level of this repository contains the full -#copyright notices and license terms. +# The COPYRIGHT file at the top level of this repository contains the full +# copyright notices and license terms. from trytond.pool import Pool -from .product import * +from . import product def register(): Pool.register( - Attachment, - Template, + product.Attachment, + product.Template, module='product_images', type_='model') diff --git a/product.py b/product.py index 7b3d0ff..20474d6 100644 --- a/product.py +++ b/product.py @@ -1,32 +1,25 @@ -#The COPYRIGHT file at the top level of this repository contains the full -#copyright notices and license terms. +# The COPYRIGHT file at the top level of this repository contains the full +# copyright notices and license terms. from trytond.model import fields from trytond.pool import Pool, PoolMeta -from trytond.pyson import Eval __all__ = ['Attachment', 'Template'] -__metaclass__ = PoolMeta class Attachment: + __metaclass__ = PoolMeta __name__ = 'ir.attachment' product_image = fields.Boolean('Product Image') class Template: + __metaclass__ = PoolMeta __name__ = 'product.template' - images_resource = fields.Function(fields.Char('Images Resource'), - 'get_images_resource') - images = fields.One2Many('ir.attachment', 'resource', 'Images', domain=[ + images = fields.One2Many('ir.attachment', 'resource', 'Images', + filter=[ ('product_image', '=', True), - ], - context={ - 'resource': Eval('images_resource'), - }, depends=['images_resource']) - - def get_images_resource(self, name): - return 'product.template,%s' % self.id + ]) @classmethod def delete(cls, templates): diff --git a/setup.py b/setup.py index 89bfcee..2cc3d22 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,11 @@ from setuptools import setup import re import os -import ConfigParser +import io +try: + from configparser import ConfigParser +except ImportError: + from ConfigParser import ConfigParser MODULE = 'product_images' PREFIX = 'nantic' @@ -12,33 +16,46 @@ MODULE2PREFIX = {} def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() + return io.open( + os.path.join(os.path.dirname(__file__), fname), + 'r', encoding='utf-8').read() -config = ConfigParser.ConfigParser() + +def get_require_version(name): + if minor_version % 2: + require = '%s >= %s.%s.dev0, < %s.%s' + else: + require = '%s >= %s.%s, < %s.%s' + require %= (name, major_version, minor_version, + major_version, minor_version + 1) + return require + +config = ConfigParser() config.readfp(open('tryton.cfg')) info = dict(config.items('tryton')) for key in ('depends', 'extras_depend', 'xml'): if key in info: info[key] = info[key].strip().splitlines() -major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2) +version = info.get('version', '0.0.1') +major_version, minor_version, _ = version.split('.', 2) major_version = int(major_version) minor_version = int(minor_version) requires = [] for dep in info.get('depends', []): - if not re.match(r'(ir|res|webdav)(\W|$)', dep): + if not re.match(r'(ir|res)(\W|$)', dep): prefix = MODULE2PREFIX.get(dep, 'trytond') - requires.append('%s_%s >= %s.%s, < %s.%s' % - (prefix, dep, major_version, minor_version, - major_version, minor_version + 1)) -requires.append('trytond >= %s.%s, < %s.%s' % - (major_version, minor_version, major_version, minor_version + 1)) + requires.append(get_require_version('%s_%s' % (prefix, dep))) +requires.append(get_require_version('trytond')) -tests_require = ['proteus >= %s.%s, < %s.%s' % - (major_version, minor_version, major_version, minor_version + 1)] +tests_require = [] +dependency_links = [] +if minor_version % 2: + # Add development index for testing with proteus + dependency_links.append('https://trydevpi.tryton.org/') setup(name='%s_%s' % (PREFIX, MODULE), - version=info.get('version', '0.0.1'), + version=version, description='', long_description=read('README'), author='NaN·tic', @@ -51,7 +68,7 @@ setup(name='%s_%s' % (PREFIX, MODULE), ], package_data={ 'trytond.modules.%s' % MODULE: (info.get('xml', []) - + ['tryton.cfg', 'locale/*.po', 'tests/*.rst']), + + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']), }, classifiers=[ 'Development Status :: 5 - Production/Stable', @@ -71,12 +88,17 @@ setup(name='%s_%s' % (PREFIX, MODULE), 'Natural Language :: Russian', 'Natural Language :: Spanish', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + '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', ], license='GPL-3', install_requires=requires, + dependency_links=dependency_links, zip_safe=False, entry_points=""" [trytond.modules] @@ -85,4 +107,5 @@ setup(name='%s_%s' % (PREFIX, MODULE), test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, + use_2to3=True, ) diff --git a/tests/__init__.py b/tests/__init__.py index 2e41aa2..902c448 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,8 @@ # The COPYRIGHT file at the top level of this repository contains the full # copyright notices and license terms. +try: + from trytond.modules.product_images.tests.test_product_images import suite +except ImportError: + from .test_product_images import suite -from .test_product_images import suite +__all__ = ['suite'] diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..3d844ea --- /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 --process-dependency-links {opts} {packages} diff --git a/tryton.cfg b/tryton.cfg index 6bde909..12b92e8 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=4.1.0 +version=4.7.0 depends: ir product