Oct 27, 2016 · Sep 26, 2016
diff --git a/.travis.yml b/.travis.yml
 env:
  - USE_OPTIONAL=true
  - USE_OPTIONAL=false
  - SIX_VERSION=1.9 USE_OPTIONAL=true

 install:
  - bash requirements-install.sh
diff --git a/requirements-install.sh b/requirements-install.sh
  pip install -U -r requirements-optional.txt
 fi

 if [[ $SIX_VERSION != "false" ]]; then
  pip install six==$SIX_VERSION
 fi

 if [[ $CI == "true" ]]; then
  pip install -U codecov
 fi
diff --git a/requirements.txt b/requirements.txt
 six
 six>=1.9
 webencodings
 ordereddict ; python_version < '2.7'
diff --git a/setup.py b/setup.py
      maintainer_email='james@hoppipolla.co.uk',
      packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
      install_requires=[
          'six',
          'six>=1.9',
          'webencodings',
      ],
      extras_require={
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,7 @@ cache:
		env:
		- USE_OPTIONAL=true
		- USE_OPTIONAL=false
		- SIX_VERSION=1.9 USE_OPTIONAL=true

		install:
		- bash requirements-install.sh
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,10 @@ if [[ $USE_OPTIONAL == "true" ]]; then
		pip install -U -r requirements-optional.txt
		fi

		if [[ $SIX_VERSION != "false" ]]; then
		pip install six==$SIX_VERSION
		fi

		if [[ $CI == "true" ]]; then
		pip install -U codecov
		fi
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,7 +102,7 @@ def default_environment():
		maintainer_email='james@hoppipolla.co.uk',
		packages=find_packages(exclude=[".tests", ".tests.", "tests.", "tests"]),
		install_requires=[
		'six',
		'six>=1.9',
		'webencodings',
		],
		extras_require={
Expand Down