From d5d2e37e775fa42b026796fd3d3cd33ceb0970c6 Mon Sep 17 00:00:00 2001 From: ?ngel ?lvarez Date: Wed, 16 May 2018 16:30:31 +0200 Subject: [PATCH] update to 4.7 --- .drone.yml | 57 ++++++++++++++++++++++++++++ __init__.py | 12 +++--- setup.py | 64 +++++++++++++++++++++++++------- stock.py | 5 ++- tests/test_stock_lot_quantity.py | 5 ++- tox.ini | 15 ++++++++ 6 files changed, 134 insertions(+), 24 deletions(-) create mode 100644 .drone.yml create mode 100644 tox.ini diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..897fc2e --- /dev/null +++ b/.drone.yml @@ -0,0 +1,57 @@ +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}" + notify: + image: drillster/drone-email + from: drone@localhost + host: smtp + port: 25 + skip_verify: true + when: + status: [ changed, failure ] + +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 5087587..36a4da3 100644 --- a/__init__.py +++ b/__init__.py @@ -1,16 +1,16 @@ # The COPYRIGHT file at the top level of this repository contains the full # copyright notices and license terms. from trytond.pool import Pool -from .stock import * -from .location import * +from . import stock +from . import location def register(): Pool.register( - Lot, - Move, - LotsByLocationStart, + stock.Lot, + stock.Move, + location.LotsByLocationStart, module='stock_lot_quantity', type_='model') Pool.register( - LotsByLocation, + location.LotsByLocation, module='stock_lot_quantity', type_='wizard') diff --git a/setup.py b/setup.py index 92a216c..fd96fcf 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 = 'stock_lot_quantity' PREFIX = 'nantic' @@ -12,36 +16,61 @@ 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 = [ + get_require_version('proteus'), +] + +series = '%s.%s' % (major_version, minor_version) +if minor_version % 2: + branch = 'default' +else: + branch = series + +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', + author_email='info@nan-tic.com', url='http://www.nan-tic.com/', download_url="https://bitbucket.org/nantic/trytond-%s" % MODULE, package_dir={'trytond.modules.%s' % MODULE: '.'}, @@ -71,12 +100,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 +119,6 @@ setup(name='%s_%s' % (PREFIX, MODULE), test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, + use_2to3=True, + convert_2to3_doctests=[], ) diff --git a/stock.py b/stock.py index ad063d8..1d55228 100644 --- a/stock.py +++ b/stock.py @@ -1,15 +1,15 @@ # The COPYRIGHT file at the top level of this repository contains the full # copyright notices and license terms. -from trytond.pool import Pool, PoolMeta +from trytond.pool import PoolMeta from trytond.pyson import Eval from trytond.transaction import Transaction __all__ = ['Lot', 'Move'] -__metaclass__ = PoolMeta class Lot: __name__ = 'stock.lot' + __metaclass__ = PoolMeta @classmethod def get_quantity(cls, lots, name): @@ -21,6 +21,7 @@ class Lot: class Move(): __name__ = 'stock.move' + __metaclass__ = PoolMeta @classmethod def __setup__(cls): diff --git a/tests/test_stock_lot_quantity.py b/tests/test_stock_lot_quantity.py index 7d04381..668c752 100644 --- a/tests/test_stock_lot_quantity.py +++ b/tests/test_stock_lot_quantity.py @@ -6,12 +6,13 @@ import trytond.tests.test_tryton from trytond.tests.test_tryton import ModuleTestCase -class TestCase(ModuleTestCase): +class StockLotQuantityTestCase(ModuleTestCase): 'Test module' module = 'stock_lot_quantity' def suite(): suite = trytond.tests.test_tryton.suite() - suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestCase)) + suite.addTests(unittest.TestLoader().loadTestsFromTestCase( + StockLotQuantityTestCase)) return suite diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..2082ab4 --- /dev/null +++ b/tox.ini @@ -0,0 +1,15 @@ +[tox] +envlist = {py27,py34,py35,py36}-{sqlite,postgresql},pypy-{sqlite,postgresql} + +[testenv] +commands = {envpython} setup.py test +deps = + {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5 + pypy-postgresql: psycopg2cffi >= 2.5 + sqlite: sqlitebck +setenv = + sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://} + postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://} + sqlite: DB_NAME={env:SQLITE_NAME::memory:} + postgresql: DB_NAME={env:POSTGRESQL_NAME:test} +install_command = pip install --pre --process-dependency-links {opts} {packages}