Drop Python 3.4 support (via requests 2.x)

.readthedocs.yaml

@@ -0,0 +1,20 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.6
+  install:
+    - method: setuptools
+      path: .

.travis.yml

@@ -6,12 +6,14 @@ sudo: required
 services:
   - docker
 
+dist: xenial   # required for Python >= 3.7
 language: python
 python:
-  - 3.6
-  - 3.5
-  - 3.4
-  - 2.7
+  - "3.8-dev"
+  - "3.7"
+  - "3.6"
+  - "3.5"
+  - "2.7"
 
 before_install:
   - docker pull otetz/alpine-tor
@@ -28,11 +30,11 @@ script: tox
 # travis_pypi_setup.py script to finish PyPI deployment setup
 deploy:
   provider: pypi
-  distributions: sdist bdist_wheel
+  distributions: "sdist bdist_wheel"
   user: Otetz
   password:
     secure: PLEASE_REPLACE_ME
+  skip_existing: true
   on:
     tags: true
     repo: Otetz/requests_proxy_adapter
-    python: 2.7

CONTRIBUTING.rst

@@ -101,7 +101,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
+3. The pull request should work for Python 2.7, 3.5, 3.6 and 3.7. Check
    https://travis-ci.org/Otetz/requests_proxy_adapter/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
@@ -112,3 +112,7 @@ To run a subset of tests::
 
 $ py.test tests.test_requests_proxy_adapter
 
+To run local anonymous proxy instance::
+
+$ docker pull otetz/alpine-tor
+$ docker run -d --rm --name anonymizer -p 8118:8118 -e tors=1 -e privoxy=1 -e new_circuit_period=20 -e max_circuit_dirtiness=60 -e circuit_build_timeout=15 otetz/alpine-tor

MANIFEST.in

@@ -8,4 +8,5 @@ recursive-include tests *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 
-recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
+#documentation
+recursive-include docs/_build/html *

setup.cfg

@@ -18,9 +18,9 @@ classifier =
      Programming Language :: Python :: 2
      Programming Language :: Python :: 2.7
      Programming Language :: Python :: 3
-     Programming Language :: Python :: 3.4
      Programming Language :: Python :: 3.5
      Programming Language :: Python :: 3.6
+     Programming Language :: Python :: 3.7
 keywords =
     requests
     proxy
@@ -50,11 +50,11 @@ max-line-length = 120
 
 [build_sphinx]
 source-dir = docs
-build-dir  = docs/build
+build-dir  = docs/_build
 all_files  = 1
 
 [upload_sphinx]
-upload-dir = docs/build/html
+upload-dir = docs/_build/html
 
 [pbr]
 autodoc_tree_index_modules = 1

tox.ini

@@ -1,11 +1,14 @@
 [tox]
-envlist = py27, py34, py35, py36, flake8
+envlist = py27, py35, py36, py37, py38-dev, flake8
 
 [travis]
+dist = xenial   # required for Python >= 3.7
 python =
+    3.8-dev: py38-dev
+    3.8: py38
+    3.7: py37
     3.6: py36
     3.5: py35
-    3.4: py34
     2.7: py27
 
 [testenv:flake8]