From 4ac0b509a3403ec4cf337fcb087d36109d853b6e Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 14 Jul 2023 08:11:47 +0200 Subject: [PATCH] WIP: Remove py2 and modernize The gate is currently broken for this package, that is using very old requirements and py2. This is an attempt to repair things, even though SQLAlchemy-migrate is heading for EOL. This patch: - removes py2 tests from tox.ini. - removes sphinx<1.2 constraint. - fixes doc/source/conf.py regarding ur'strings'. - removes openstack-python-jobs and sqlalchemy-migrate-tox-py27sa07 from gating. Change-Id: I595a602ca7272e9d4f4461ac1f4d6b010b5087a5 --- .zuul.yaml | 2 -- doc/source/conf.py | 4 ++-- setup.cfg | 2 -- test-requirements.txt | 2 +- tox.ini | 21 +-------------------- 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 974970b..123240f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,14 +1,12 @@ - project: templates: - docs-on-readthedocs - - openstack-python-jobs - openstack-python35-jobs - openstack-python36-jobs vars: rtd_webhook_id: '61274' check: jobs: - - sqlalchemy-migrate-tox-py27sa07 - sqlalchemy-migrate-devstack: voting: false gate: diff --git a/doc/source/conf.py b/doc/source/conf.py index 91e824e..b654475 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -182,8 +182,8 @@ htmlhelp_basename = 'SQLAlchemyMigratedoc' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). latex_documents = [ - ('index', 'SQLAlchemyMigrate.tex', ur'SQLAlchemy Migrate Documentation', - ur'Evan Rosson, Jan Dittberner, Domen Kožar', 'manual'), + ('index', 'SQLAlchemyMigrate.tex', 'SQLAlchemy Migrate Documentation', + 'Evan Rosson, Jan Dittberner, Domen Kožar', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/setup.cfg b/setup.cfg index f23b11d..92b285e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,8 +13,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 diff --git a/test-requirements.txt b/test-requirements.txt index bc8d8d2..0f6fa14 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ mox>=0.5.3 mysqlclient psycopg2 python-subunit>=0.0.18 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2 sphinxcontrib_issuetracker testrepository>=0.0.17 testtools>=0.9.34,<0.9.36 diff --git a/tox.ini b/tox.ini index aed2fa2..b407786 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py27,py27sa07,py27sa08,py27sa09,py33,py34,py35,py36,pep8 +envlist = py33,py34,py35,py36,pep8 [testenv] usedevelop = True @@ -13,25 +13,6 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = bash tools/pretty_tox.sh '{posargs}' -[testenv:py27] -deps = sqlalchemy>=0.9 - -r{toxinidir}/test-requirements.txt - -[testenv:py27sa07] -basepython = python2.7 -deps = sqlalchemy>=0.7,<=0.7.99 - -r{toxinidir}/test-requirements.txt - -[testenv:py27sa08] -basepython = python2.7 -deps = sqlalchemy>=0.8,<=0.8.99 - -r{toxinidir}/test-requirements.txt - -[testenv:py27sa09] -basepython = python2.7 -deps = sqlalchemy>=0.9,<=0.9.99 - -r{toxinidir}/test-requirements.txt - [testenv:py33] deps = sqlalchemy>=0.9 -r{toxinidir}/test-requirements.txt