Merge pull request gusdan#6 from uncovertruth/fix/env_name

Fix wrong env name

Author: opapy

.travis.yml

@@ -5,54 +5,52 @@ matrix:
   fast_finish: true
   include:
   - python: 2.7
-    env: TOXENV=py27-dj18
+    env: TOX_ENV=py27-dj18
   - python: 3.3
-    env: TOXENV=py33-dj18
+    env: TOX_ENV=py33-dj18
   - python: 3.4
-    env: TOXENV=py34-dj18
+    env: TOX_ENV=py34-dj18
   - python: 3.5
-    env: TOXENV=py34-dj18
+    env: TOX_ENV=py34-dj18
   - python: 2.7
-    env: TOXENV=py27-dj19
+    env: TOX_ENV=py27-dj19
   - python: 3.4
-    env: TOXENV=py34-dj19
+    env: TOX_ENV=py34-dj19
   - python: 3.5
-    env: TOXENV=py35-dj19
+    env: TOX_ENV=py35-dj19
   - python: 2.7
-    env: TOXENV=py27-dj110
+    env: TOX_ENV=py27-dj110
   - python: 3.4
-    env: TOXENV=py34-dj110
+    env: TOX_ENV=py34-dj110
   - python: 3.5
-    env: TOXENV=py35-dj110
+    env: TOX_ENV=py35-dj110
   - python: 2.7
-    env: TOXENV=py27-dj111
+    env: TOX_ENV=py27-dj111
   - python: 3.4
-    env: TOXENV=py34-dj111
+    env: TOX_ENV=py34-dj111
   - python: 3.5
-    env: TOXENV=py35-dj111
+    env: TOX_ENV=py35-dj111
   - python: 3.6
-    env: TOXENV=py36-dj111
+    env: TOX_ENV=py36-dj111
   - python: 3.5
-    env: TOXENV=py35-djdev
+    env: TOX_ENV=py35-djdev
   - python: 3.6
-    env: TOXENV=py36-djdev
+    env: TOX_ENV=py36-djdev
   - python: 3.6
-    env: TOXENV=flake8
+    env: TOX_ENV=flake8
   - python: 3.6
-    env: TOXENV=isort
+    env: TOX_ENV=isort
   - python: 3.6
-    env: TOXENV=readme
+    env: TOX_ENV=readme
   - python: 3.6
-    env: TOXENV=check-manifest
+    env: TOX_ENV=check-manifest
   allow_failures:
   - env: TOX_ENV=py35-djdev
   - env: TOX_ENV=py36-djdev
 install:
-- pip install tox codecov
+- pip install tox
 script:
-- tox -v
-after_success:
-- codecov
+- tox -e "$TOX_ENV"
 deploy:
   provider: pypi
   user: uncovertruth

django_elastipymemcache/memcached.py

@@ -44,6 +44,8 @@ def __init__(self, server, params):
             raise InvalidCacheBackendError(
                 'Server configuration should be in format IP:port')
 
+        # Patch for django<1.11
+        self._options = self._options or dict()
         self._ignore_cluster_errors = self._options.get(
             'ignore_exc', False)
 

requirements.txt

@@ -1,6 +1,8 @@
-nose
+check-manifest
 coverage
 flake8
 isort
+mock
+nose
+pymemcache
 readme_renderer
-check-manifest

tests/test_protocol.py

@@ -113,7 +113,7 @@ def test_no_configuration_protocol_support_with_errors_ignored(Telnet):
         call(b'version\n'),
         call(b'config get cluster\n'),
     ])
-    eq_(info['version'], '1.4.34')
+    eq_(info['version'], b'1.4.34')
     eq_(info['nodes'], [('test', 0)])
 
 

tox.ini

@@ -1,29 +1,33 @@
 [tox]
 envlist =
-    py{27,33,34,35,36}-dj{18,19,110,111,dev}
-    flake8,
-    isort,
-    readme
-    check-manifest
+  py{27,33,34,35,36}-dj{18,19,110,111,dev}
+  flake8,
+  isort,
+  readme
+  check-manifest
 
 [testenv]
 basepython =
-    py27: python2.7
-    py33: python3.3
-    py34: python3.4
-    py35: python3.5
-    py36: python3.6
+  py27: python2.7
+  py33: python3.3
+  py34: python3.4
+  py35: python3.5
+  py36: python3.6
 deps =
-    dj18: Django>=1.8,<1.9
-    dj19: Django>=1.9,<1.10
-    dj110: Django>=1.10,<1.11
-    dj111: Django>=1.11,<2.0
-    djdev: https://github.com/django/django/archive/master.tar.gz
-    nose
-    coverage
+  dj18: Django>=1.8,<1.9
+  dj19: Django>=1.9,<1.10
+  dj110: Django>=1.10,<1.11
+  dj111: Django>=1.11,<2.0
+  djdev: https://github.com/django/django/archive/master.tar.gz
+  -r{toxinidir}/requirements.txt
+  py36-dj111: codecov
 setenv =
-    PYTHONPATH = {toxinidir}
-commands = coverage run --source=django_elastipymemcache -a setup.py test
+  PYTHONPATH = {toxinidir}
+commands =
+  coverage run --source=django_elastipymemcache -m nose
+  py36-dj111: coverage report
+  py36-dj111: coverage xml
+  py36-dj111: codecov
 
 [testenv:flake8]
 basepython = python3.6