Skip to content

Commit

Permalink
Merge pull request #3 from Hearst-Hatchery/configure-travis
Browse files Browse the repository at this point in the history
remove versions we do not need to support
  • Loading branch information
greedo committed Aug 7, 2019
2 parents 629f8d1 + 45049b9 commit 4a299ef
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 71 deletions.
2 changes: 0 additions & 2 deletions .readthedocs.yml

This file was deleted.

31 changes: 1 addition & 30 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,19 @@ dist: xenial
language: python
cache: pip

notifications:
irc: "chat.freenode.net#pil"

# Run fast lint first to get fast feedback.
# Run slow PyPy* next, to give them a headstart and reduce waiting time.
# Run latest 3.x and 2.x next, to get quick compatibility results.
# Then run the remainder, with fastest Docker jobs last.

matrix:
fast_finish: true
include:
- python: "3.6"
name: "Lint"
env: LINT="true"
- python: "pypy2.7-6.0"
name: "PyPy2 Xenial"
dist: xenial
env: LINT="false"
- python: "pypy3.5-6.0"
name: "PyPy3 Xenial"
dist: xenial
- python: '3.7'
name: "3.7 Xenial"
- python: '2.7'
name: "2.7 Xenial"
- python: '2.7'
name: "2.7 Trusty"
dist: trusty
- python: "2.7_with_system_site_packages" # For PyQt4
name: "2.7_with_system_site_packages Xenial"
services: xvfb
- python: "2.7_with_system_site_packages" # For PyQt4
name: "2.7_with_system_site_packages Trusty"
dist: trusty
- python: '3.6'
name: "3.6 Xenial"
- python: '3.6'
Expand All @@ -50,16 +30,7 @@ matrix:
- python: "3.8-dev"
name: "3.8-dev Xenial"
- env: DOCKER="alpine" DOCKER_TAG="master"
- env: DOCKER="arch" DOCKER_TAG="master" # contains PyQt5
- env: DOCKER="ubuntu-trusty-x86" DOCKER_TAG="master"
- env: DOCKER="ubuntu-xenial-amd64" DOCKER_TAG="master"
- env: DOCKER="debian-stretch-x86" DOCKER_TAG="master"
- env: DOCKER="centos-6-amd64" DOCKER_TAG="master"
- env: DOCKER="centos-7-amd64" DOCKER_TAG="master"
- env: DOCKER="amazon-1-amd64" DOCKER_TAG="master"
- env: DOCKER="amazon-2-amd64" DOCKER_TAG="master"
- env: DOCKER="fedora-28-amd64" DOCKER_TAG="master"
- env: DOCKER="fedora-29-amd64" DOCKER_TAG="master"

services:
- docker
Expand Down
30 changes: 0 additions & 30 deletions Tests/test_pyroma.py

This file was deleted.

14 changes: 6 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -759,17 +759,15 @@ def debug_build():
try:
setup(name=NAME,
version=PILLOW_VERSION,
description='Python Imaging Library (Fork)',
description='Python Imaging Library SIMD (Fork)',
long_description=_read('PyPI.rst').decode('utf-8'),
author='Alex Clark (Fork Author)',
author_email='aclark@aclark.net',
url='https://github.com/uploadcare/pillow-simd',
author='Joe Cabrera (Fork Author)',
author_email='joe.cabrera@hearst.com',
license='MIT',
url='https://github.com/Hearst-Hatchery/pillow-simd',
classifiers=[
"Development Status :: 6 - Mature",
"License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)", # noqa: E501
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
Expand All @@ -781,7 +779,7 @@ def debug_build():
"Topic :: Multimedia :: Graphics :: Graphics Conversion",
"Topic :: Multimedia :: Graphics :: Viewers",
],
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
python_requires=">=3.5",
cmdclass={"build_ext": pil_build_ext},
ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
include_package_data=True,
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[tox]
envlist =
lint
py{27,35,36,37}
py{35,36,37}
minversion = 1.9

[testenv]
Expand Down

0 comments on commit 4a299ef

Please sign in to comment.