CashStar · matteiuspi · Apr 10, 2017 · Apr 10, 2017 · Apr 11, 2017 · Apr 11, 2017
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+---
+version: 2
+updates:
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: daily
+      time: '09:00'
+      timezone: Asia/Tokyo
+    open-pull-requests-limit: 10
diff --git a/.gitignore b/.gitignore
@@ -1,37 +1,101 @@
+### https://raw.github.com/github/gitignore/f57304e9762876ae4c9b02867ed0cb887316387e/python.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
+*$py.class
 
 # C extensions
 *.so
 
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
 .installed.cfg
-lib
-lib64
-__pycache__
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
 
 # Installer logs
 pip-log.txt
+pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+htmlcov/
+.tox/
 .coverage
-.tox
+.coverage.*
+.cache
 nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
 
 # Translations
 *.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# dotenv
+.env
+
+# virtualenv
+.venv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
 
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-.idea
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,43 @@
+sudo: false
+language: python
+python:
+  - 3.6
+  - 3.7
+  - 3.8
+cache: pip
+env:
+  - DJANGO=2.2
+  - DJANGO=3.0
+  - DJANGO=3.1
+  - DJANGO=dev
+
+matrix:
+  include:
+    - python: 3.8
+      env: TOXENV=flake8
+    - python: 3.8
+      env: TOXENV=isort
+    - python: 3.8
+      env: TOXENV=readme
+    - python: 3.8
+      env: TOXENV=check-manifest
+  allow_failures:
+    - env: DJANGO=dev
+install:
+- travis_retry python3 -m pip install tox-travis
+script:
+- tox
+deploy:
+  provider: pypi
+  username: __token__
+  password:
+    secure: "HBbDdcrrzRrSXbQGz3cz24/xNIW77tVlHQ+D6DS5raOSV7en5CPaiWZ50YkMQa08nfBOR1RBT8JivrC05qz1+TqMwOz0+rinFeGPmu9gLY8f+1kx0UZnmXG7GHsm6dBGOP6nIHA40+rtK/YLuhskdd2hEBIOAuAxXuCSd1UQ/3bj/nuspDwcot9OdJiyn+Xl+cjI39Gt8WlF7ZBjgFRw1hNSIJ2f0or38zf+SSDY6QgKiJZCn+4sooy0assCms84LSKumSl7Ya50IWwBGJgJaNPxikqgTf3rDP9bT25OLtJw78zJnO4QC2PJ9Y7j2tzeYkelHJM794uAtKNaW1SanlYdBXQoE7m1CE8DszZxCtN/siuz+30whFJ885pPaSN3m5uJct/v9GxBEAHtoCrwwdfrTvzVCU43PGwPZvO768k465rRGUnBInLybO5hTq6myajecZB2WhVXMh7/KMcXlVtnD5PvIhxLkLPVIGBK+1wFfvH/4ijZl8Dhz5PXP53AcX/Ohdli7+kd9DQEvieE2bhDpBaJq2r7B4etW/bjz76GQ704uzuF5JXXEibaT1fox8nqJzghuWfcXJvoTa20iR1quuHg0Z4qBIYh76CUXafi4iIZ0fCcIDVPWM7KSp1rvt4BgCdi1csQdTasw0l0WGoKdOSu+LlNSrqzPLoXQlE="
+  distributions: sdist bdist_wheel
+  skip_upload_docs: true
+  on:
+    repo: harikitech/django-elastipymemcache
+    tags: true
+    python: 3.8
+    condition: "$DJANGO = 3.0"
+notifications:
+  email: false
diff --git a/LICENSE b/LICENSE
@@ -18,3 +18,4 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,13 @@
+include LICENSE
 include README.rst
-include MANIFEST.in
-include setup.py
+
+exclude requirements.txt
+exclude tox.ini
+
+global-exclude __pycache__
+global-exclude *.py[co]
+
+prune .github
+prune tests
+
+graft django_elastipymemcache
diff --git a/README.rst b/README.rst
@@ -1,31 +1,35 @@
-Amazon ElastiCache backend for Django
-=====================================
+=======================
+django-elastipymemcache
+=======================
+
+.. index: README
+.. image:: https://travis-ci.org/harikitech/django-elastipymemcache.svg?branch=master
+    :target: https://travis-ci.org/harikitech/django-elastipymemcache
+.. image:: https://codecov.io/gh/harikitech/django-elastipymemcache/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/harikitech/django-elastipymemcache
+
+Purpose
+-------
 
 Simple Django cache backend for Amazon ElastiCache (memcached based). It uses
-`pylibmc <http://github.com/lericson/pylibmc>`_ and sets up a connection to each
+`pymemcache <https://github.com/pinterest/pymemcache>`_ and sets up a connection to each
 node in the cluster using
 `auto discovery <http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/AutoDiscovery.html>`_.
-
+Originally forked from `django-elasticache <https://github.com/gusdan/django-elasticache>`_.
 
 Requirements
 ------------
 
-* pylibmc
-* Django 1.5+.
-
-It was written and tested on Python 2.7 and 3.4.
+* pymemcache
+* Django>=2.2
+* django-pymemcache>=1.0
 
 Installation
 ------------
 
-Get it from `pypi <http://pypi.python.org/pypi/django-elasticache>`_::
-
-    pip install django-elasticache
-
-or `github <http://github.com/gusdan/django-elasticache>`_::
-
-    pip install -e git://github.com/gusdan/django-elasticache.git#egg=django-elasticache
+Get it from `pypi <http://pypi.python.org/pypi/django-elastipymemcache>`_::
 
+    pip install django-elastipymemcache
 
 Usage
 -----
@@ -34,95 +38,15 @@ Your cache backend should look something like this::
 
     CACHES = {
         'default': {
-            'BACKEND': 'django_elasticache.memcached.ElastiCache',
-            'LOCATION': 'cache-c.draaaf.cfg.use1.cache.amazonaws.com:11211',
-            'OPTIONS' {
-                'IGNORE_CLUSTER_ERRORS': [True,False],
-            },
-        }
-    }
-
-By the first call to cache it connects to cluster (using ``LOCATION`` param),
-gets list of all nodes and setup pylibmc client using full
-list of nodes. As result your cache will work with all nodes in cluster and
-automatically detect new nodes in cluster. List of nodes are stored in class-level
-cached, so any changes in cluster take affect only after restart of working process.
-But if you're using gunicorn or mod_wsgi you usually have max_request settings which
-restart process after some count of processed requests, so auto discovery will work
-fine.
-
-The ``IGNORE_CLUSTER_ERRORS`` option is useful when ``LOCATION`` doesn't have support
-for ``config get cluster``. When set to ``True``, and ``config get cluster`` fails,
-it returns a list of a single node with the same endpoint supplied to ``LOCATION``.
-
-Django-elasticache changes default pylibmc params to increase performance.
-
-Another solutions
------------------
-
-ElastiCache provides memcached interface so there are three solution of using it:
-
-1. Memcached configured with location = Configuration Endpoint
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In this case your application
-will randomly connect to nodes in cluster and cache will be used with not optimal
-way. At some moment you will be connected to first node and set item. Minute later
-you will be connected to another node and will not able to get this item.
-
- ::
-
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
-            'LOCATION': 'cache.gasdbp.cfg.use1.cache.amazonaws.com:11211',
+            'BACKEND': 'django_elastipymemcache.backend.ElastiPymemcache',
+            'LOCATION': '[configuration endpoint]:11211',
+            'OPTIONS': {
+              'ignore_exc': True, # pymemcache Client params
+              'ignore_cluster_errors': True, # ignore get cluster info error
+            }
         }
     }
 
-
-2. Memcached configured with all nodes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-It will work fine, memcache client will
-separate items between all nodes and will balance loading on client side. You will
-have problems only after adding new nodes or delete old nodes. In this case you should
-add new nodes manually and don't forget update your app after all changes on AWS.
-
- ::
-
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
-            'LOCATION': [
-                'cache.gqasdbp.0001.use1.cache.amazonaws.com:11211',
-                'cache.gqasdbp.0002.use1.cache.amazonaws.com:11211',
-            ]
-        }
-    }
-
-
-3. Use django-elasticache
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-It will connect to cluster and retrieve ip addresses
-of all nodes and configure memcached to use all nodes.
-
- ::
-
-    CACHES = {
-        'default': {
-            'BACKEND': 'django_elasticache.memcached.ElastiCache',
-            'LOCATION': 'cache-c.draaaf.cfg.use1.cache.amazonaws.com:11211',
-        }
-    }
-
-
-Difference between setup with nodes list (django-elasticache) and
-connection to only one configuration Endpoint (using dns routing) you can see on
-this graph:
-
-.. image:: https://raw.github.com/gusdan/django-elasticache/master/docs/images/get%20operation%20in%20cluster.png
-
 Testing
 -------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
		COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
		IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.