requirements cleanup/streamlining and trying something different for travis.

Author: ikirudennis

.travis.yml

@@ -1,8 +1,8 @@
 dist: xenial   # required for Python >= 3.7
 language: python
 env:
-  - REQUIREMENTS=true
-  - REQUIREMENTS=false
+  - IMAGESIZE=true
+  - IMAGESIZE=false
 python:
   - "3.5"
   - "3.6"
@@ -12,10 +12,9 @@ python:
   - "pypy3"
 # command to install dependencies
 install:
-  - if [[ $REQUIREMENTS == true ]] ; then pip install -r requirements.txt ; fi
   - pip install -U coveralls pytest pytest-cov 'coverage<5' codecov
-  - pip install -e .
-  - if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' && $REQUIREMENTS == true ]] ; then pip uninstall -y regex; fi
+  - if [[ $IMAGESIZE == true ]] ; then pip install -e '.[imagesize]' ; fi
+  - if [[ $IMAGESIZE == false ]] ; then pip install -e . ; fi
 # command to run tests
 script: py.test
 after_success:

requirements.txt

@@ -1,3 +1 @@
-html5lib>=1.0.1
 Pillow
-regex

setup.py

@@ -57,12 +57,11 @@ def get_version():
     keywords='textile,text,html markup',
     install_requires=[
         'html5lib>=1.0.1',
+        'regex ; python_implementation != PyPy',
         ],
     extras_require={
-        ':python_version=="2.6"': ['ordereddict>=1.1'],
         'develop': ['pytest', 'pytest-cov'],
         'imagesize': ['Pillow>=3.0.0'],
-        'regex': ['regex'],
     },
     entry_points={'console_scripts': ['pytextile=textile.__main__:main']},
     setup_requires=['pytest-runner'],