Remove support for Python 2.7

issue7497
review53261002
This commit is contained in:
Cédric Krier
2018-06-26 19:11:41 +02:00
parent a9aed738d8
commit c6f98408bf
7 changed files with 18 additions and 31 deletions
-6
View File
@@ -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
+3 -1
View File
@@ -1,5 +1,7 @@
* Remove support for Python 2.7
Version 4.8.0 - 2018-04-23
* Bug fixes (see mercurial logs for details)
Version 4.6.0 - 2017-10-30
* Initial release
* Initial release
+1 -1
View File
@@ -4,7 +4,7 @@ Installing trytond_account_dunning_email
Prerequisites
-------------
* Python 2.7 or later (http://www.python.org/)
* Python 3.4 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
+3 -6
View File
@@ -15,8 +15,7 @@ from trytond.wizard import StateTransition
__all__ = ['DunningLevel', 'ProcessDunning', 'Dunning', 'DunningEmailLog']
class DunningLevel:
__metaclass__ = PoolMeta
class DunningLevel(metaclass=PoolMeta):
__name__ = 'account.dunning.level'
send_email = fields.Boolean("Send Email")
email_template = fields.Many2One(
@@ -48,8 +47,7 @@ class DunningLevel:
return
class ProcessDunning:
__metaclass__ = PoolMeta
class ProcessDunning(metaclass=PoolMeta):
__name__ = 'account.dunning.process'
send_email = StateTransition()
@@ -77,8 +75,7 @@ class ProcessDunning:
return self.next_state('send_email')
class Dunning:
__metaclass__ = PoolMeta
class Dunning(metaclass=PoolMeta):
__name__ = 'account.dunning'
def send_email(self, datamanager=None):
+7 -13
View File
@@ -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):
@@ -27,6 +24,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
@@ -100,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',
@@ -109,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,
@@ -119,8 +117,4 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
use_2to3=True,
convert_2to3_doctests=[
'tests/scenario_account_dunning_email.rst',
],
)
+1 -1
View File
@@ -115,4 +115,4 @@ Process dunning::
>>> process_dunning.execute('process')
>>> dunning.reload()
>>> dunning.state
u'done'
'done'
+3 -3
View File
@@ -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://}