diff --git a/.drone.yml b/.drone.yml index e0bc2f7026..5da6083eb7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,12 +25,6 @@ services: 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 diff --git a/CHANGELOG b/CHANGELOG index 81ba76ad91..1bcb258270 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Remove support for Python 2.7 + Version 4.8.0 - 2018-04-23 * Bug fixes (see mercurial logs for details) diff --git a/INSTALL b/INSTALL index 2ecc2703c5..5a8ba24616 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing trytond_stock_lot_sled Prerequisites ------------- - * Python 2.7 or later (http://www.python.org/) + * Python 3.4 or later (http://www.python.org/) * python-sql (http://code.google.com/p/python-sql/) * trytond (http://www.tryton.org/) * trytond_product (http://www.tryton.org/) diff --git a/product.py b/product.py index 5f306e48f8..627fe214aa 100644 --- a/product.py +++ b/product.py @@ -9,8 +9,7 @@ from .stock import DATE_STATE __all__ = ['Template', 'Product'] -class Template: - __metaclass__ = PoolMeta +class Template(metaclass=PoolMeta): __name__ = 'product.template' shelf_life_state = fields.Selection( @@ -39,6 +38,5 @@ class Template: return 'none' -class Product: - __metaclass__ = PoolMeta +class Product(metaclass=PoolMeta): __name__ = 'product.product' diff --git a/setup.py b/setup.py index b6be66b13e..c621a63dd3 100644 --- a/setup.py +++ b/setup.py @@ -1,15 +1,12 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -from setuptools import setup -import re -import os import io -try: - from configparser import ConfigParser -except ImportError: - from ConfigParser import ConfigParser +import os +import re +from configparser import ConfigParser +from setuptools import setup def read(fname): @@ -101,7 +98,6 @@ setup(name=name, 'Natural Language :: Slovenian', 'Natural Language :: Spanish', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', @@ -110,6 +106,7 @@ setup(name=name, 'Topic :: Office/Business', ], license='GPL-3', + python_requires='>=3.4', install_requires=requires, dependency_links=dependency_links, zip_safe=False, @@ -120,5 +117,4 @@ setup(name=name, test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, - use_2to3=True, ) diff --git a/stock.py b/stock.py index 7e3d257b4d..40272b47bd 100644 --- a/stock.py +++ b/stock.py @@ -24,8 +24,7 @@ shelf_life_delay = fields.TimeDelta( help="The delay before removal from the forecast.") -class Configuration: - __metaclass__ = PoolMeta +class Configuration(metaclass=PoolMeta): __name__ = 'stock.configuration' shelf_life_delay = fields.MultiValue(shelf_life_delay) @@ -44,8 +43,7 @@ class ConfigurationLotShelfLife(ModelSQL, ValueMixin): shelf_life_delay = shelf_life_delay -class Lot: - __metaclass__ = PoolMeta +class Lot(metaclass=PoolMeta): __name__ = 'stock.lot' shelf_life_expiration_date = fields.Date('Shelf Life Expiration Date', @@ -146,8 +144,7 @@ class Lot: }) -class Move: - __metaclass__ = PoolMeta +class Move(metaclass=PoolMeta): __name__ = 'stock.move' @classmethod @@ -327,8 +324,7 @@ class Move: return query -class Period: - __metaclass__ = PoolMeta +class Period(metaclass=PoolMeta): __name__ = 'stock.period' @classmethod diff --git a/tox.ini b/tox.ini index 2082ab4f4d..adbcbf8431 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] -envlist = {py27,py34,py35,py36}-{sqlite,postgresql},pypy-{sqlite,postgresql} +envlist = {py34,py35,py36}-{sqlite,postgresql},pypy3-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5 - pypy-postgresql: psycopg2cffi >= 2.5 + {py34,py35,py36}-postgresql: psycopg2 >= 2.5 + pypy3-postgresql: psycopg2cffi >= 2.5 sqlite: sqlitebck setenv = sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}