Merge 6b4c0b1 into f8a15e8

.travis.yml

@@ -1,53 +1,69 @@
 language: python
 sudo: false
 dist: trusty
+cache:
+- apt
+- pip
+services:
+- redis
 addons:
- firefox: latest
- apt:
+  firefox: latest
+  apt:
     sources:
-      - google-chrome
+    - google-chrome
     packages:
-      - google-chrome-stable
-cache:
-  - pip
-  - apt
+    - google-chrome-stable
 python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
+- '2.7'
+- '3.5'
+- '3.6'
 env:
   global:
-    - DISPLAY=:99.0
+  - DISPLAY=:99.0
+  - GECKO_DRIVER_VERSION=v0.16.1
+  - CHROME_DRIVER_VERSION=2.29
   matrix:
-    - TOXENV=qa
-    - DJANGO=18
-    - DJANGO=19
-    - DJANGO=110
-    - DJANGO=master
+  - DJANGO=18
+  - DJANGO=110
+  - DJANGO=111
+  - DJANGO=master
+  - TOXENV=qa
 matrix:
   fast_finish: true
   allow_failures:
-    - env: DJANGO=master
+  - env: DJANGO=master
+  exclude:
+  - env: DJANGO=master
+    python: '2.7'
+  - env: TOXENV=qa
+    python: '2.7'
+  - env: TOXENV=qa
+    python: '3.5'
 install:
-  - pip install --upgrade pip tox
-  - pip install -U coveralls
-  - sh -e /etc/init.d/xvfb start
+- pip install --upgrade pip tox
+- pip install -U coveralls
+- sh -e /etc/init.d/xvfb start
 before_script:
-  - mkdir bin
-  - curl -O https://chromedriver.storage.googleapis.com/2.27/chromedriver_linux64.zip
-  - unzip chromedriver_linux64.zip -d bin
-  - curl -Lo geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-linux64.tar.gz
-  - tar xzf geckodriver.tar.gz -C bin
-  - PATH=$PATH:$PWD/bin
-  - nvm install --lts
-  - npm install -g standard
+- mkdir bin
+- curl -O https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION}/chromedriver_linux64.zip
+- unzip chromedriver_linux64.zip -d bin
+- curl -Lo - "https://github.com/mozilla/geckodriver/releases/download/${GECKO_DRIVER_VERSION}/geckodriver-${GECKO_DRIVER_VERSION}-linux64.tar.gz" | tar xzf - -C bin
+- PATH=$PATH:$PWD/bin
+- |
+  if [[ -z $TOXENV ]]; then
+    export TOXENV=py$(echo $TRAVIS_PYTHON_VERSION | sed -e 's/\.//g')-dj$DJANGO
+  fi
+- echo $TOXENV
 script:
-  - |
-    if [[ $TOXENV == qa ]]; then
-      tox -e qa
-    else
-      tox -e py$(echo $TRAVIS_PYTHON_VERSION | sed -e 's/\.//g')-dj$DJANGO
-    fi
-  - standard
+- tox -e $TOXENV
 after_success:
-  - coveralls
+- coveralls
+deploy:
+  provider: pypi
+  user: codingjoe
+  password:
+    secure: OzNShO+N3zL3LIyJ7Fu/TFgJTaI+FlZxLItjPTu5tAfvrxPWmKXJkA7b8znx5O2w0kSynk0R1Ddyd6Ri4AIyS5SGm2ZbvrTyIpaXPvWMBl1o8X/nH14f61HP2piEtnk24FBLTbublgC9N1G4w/166jAwv2dxS9aWJGioAlSOgH8=
+  on:
+    tags: true
+    distributions: sdist bdist_wheel
+    repo: codingjoe/django-s3file

MANIFEST.in

@@ -1,2 +1,5 @@
 include README.md
-recursive-include s3file *
+recursive-include s3file *
+
+[bdist_wheel]
+universal=1

setup.cfg

@@ -3,9 +3,8 @@ addopts = --tb=short -rxs
 DJANGO_SETTINGS_MODULE=tests.testapp.settings
 norecursedirs = env docs
 
-[flake8]
+[pycodestyle]
 max-line-length = 99
-max-complexity = 10
 statistics = true
 show-source = true
 exclude = */migrations/*,docs/*,env/*,.tox/*

tests/conftest.py

@@ -15,6 +15,7 @@
 browsers = {
     'chrome': webdriver.Chrome,
     'firefox': webdriver.Firefox,
+    'phantomjs': webdriver.PhantomJS,
 }
 
 

tox.ini

@@ -1,14 +1,14 @@
 [tox]
-envlist = py{27,35,36}-dj{18,19,110,master},qa
+envlist = py{27,35,36}-dj{18,110,111,master},qa
 [testenv]
 setenv=
     DISPLAY=:99.0
     PYTHONPATH = {toxinidir}
 deps=
     -rrequirements-dev.txt
     dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
-    dj19: https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
     dj110: https://github.com/django/django/archive/stable/1.10.x.tar.gz#egg=django
+    dj111: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django
     djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 commands=
     coverage run --source=s3file -m 'pytest' \
@@ -22,5 +22,3 @@ deps=
     -rrequirements-dev.txt
 commands=
     isort --check-only --recursive --diff {posargs}
-    flake8 --jobs=2 {posargs}
-    pydocstyle --verbose --explain --source --count {posargs}