diff options
author | Hsiaoming Yang <me@lepture.com> | 2018-04-20 00:15:15 +0900 |
---|---|---|
committer | Hsiaoming Yang <me@lepture.com> | 2018-04-20 00:15:15 +0900 |
commit | 453e41cde09051d1afcbb4dabaa667e84e14ef20 (patch) | |
tree | 781645ac801b934029ea8a1a818238ba693bf832 | |
parent | b6adcf6fbed32466de7c0833898552d02d4d4c77 (diff) | |
download | markupsafe-453e41cde09051d1afcbb4dabaa667e84e14ef20.tar.gz |
Drop testing for 2.6 and 3.3. Add 3.6.
Via discussion pallets/meta#24
-rw-r--r-- | .appveyor.yml | 42 | ||||
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | README.rst | 2 | ||||
-rwxr-xr-x | setup.py | 6 | ||||
-rw-r--r-- | tox.ini | 2 |
5 files changed, 20 insertions, 36 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 3301365..1b6c838 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,44 +1,30 @@ environment: global: - WHEEL_VERSION: "wheel" # 2.6, 3.3 need ==0.29 - # pip module, 2.6 needs .__main__, https://stackoverflow.com/a/9407178 - PIP: "pip" - TOX: "tox" TOXENV: "py" matrix: - - PYTHON: "C:\\Python26" - WHEEL_VERSION: "wheel==0.29" - PIP: "pip.__main__" - TOX: "tox.__main__" - - PYTHON: "C:\\Python26-x64" - WHEEL_VERSION: "wheel==0.29" - PIP: "pip.__main__" - TOX: "tox.__main__" - - PYTHON: "C:\\Python27" - - PYTHON: "C:\\Python27-x64" - - PYTHON: "C:\\Python33" - WHEEL_VERSION: "wheel==0.29" - - PYTHON: "C:\\Python33-x64" - WHEEL_VERSION: "wheel==0.29" - - PYTHON: "C:\\Python34" - - PYTHON: "C:\\Python34-x64" - - PYTHON: "C:\\Python35" - - PYTHON: "C:\\Python35-x64" - - PYTHON: "C:\\Python36" - - PYTHON: "C:\\Python36-x64" + - PYTHON: C:\Python27 + - PYTHON: C:\Python27-x64 + - PYTHON: C:\Python34 + - PYTHON: C:\Python34-x64 + - PYTHON: C:\Python35 + - PYTHON: C:\Python35-x64 + - PYTHON: C:\Python36 + - PYTHON: C:\Python36-x64 + +init: + - SET PATH=%PYTHON%;%PATH% install: - - "%PYTHON%\\python.exe --version" - - "%PYTHON%\\python.exe -m %PIP% install -U pip setuptools %WHEEL_VERSION% tox" + - python -m pip install -U pip setuptools wheel tox build: off # Not a C# project, build stuff at the test step instead. test_script: - - "%PYTHON%\\python.exe -m %TOX%" + - python -m tox after_test: - - "%PYTHON%\\python.exe setup.py bdist_wheel" + - python setup.py bdist_wheel artifacts: - path: dist\*.whl diff --git a/.travis.yml b/.travis.yml index ebaf846..c975035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,11 @@ sudo: false language: python python: - - "2.6" - "2.7" - - pypy - - "3.3" - "3.4" - "3.5" - "3.6" + - pypy install: - pip install tox script: @@ -110,4 +110,4 @@ And to format that user: >>> Markup('<p>User: {0:link}').format(user) Markup(u'<p>User: <a href="/user/1"><span class=user>foo</span></a>') -Markupsafe supports Python 2.6, 2.7 and Python 3.3 and higher. +Markupsafe supports Python 2.7 and Python 3.4 and higher. @@ -79,10 +79,12 @@ def run_setup(with_binary): setup( name='MarkupSafe', version=version, - url='http://github.com/pallets/markupsafe', + url='https://www.palletsprojects.com/p/markupsafe/', license='BSD', author='Armin Ronacher', author_email='armin.ronacher@active-4.com', + maintainer='Pallets team', + maintainer_email='contact@palletsprojects.com', description='Implements a XML/HTML/XHTML Markup safe string for Python', long_description=readme, zip_safe=False, @@ -94,10 +96,8 @@ def run_setup(with_binary): 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', @@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,pypy,py33,py34,py35,py36 +envlist = py27,pypy,py34,py35,py36 [testenv] commands = py.test tests.py {posargs} |