Remove release force true

.cookiecutterrc

@@ -1,34 +1,32 @@
-# This file exists so you can easily regenerate your project.
-#
-# Unfortunatelly cookiecutter can't use this right away so
-# you have to copy this file to ~/.cookiecutterrc
+# Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
 
-default_context:
-
-    appveyor:                  'yes'
-    c_extension_optional:      'no'
-    c_extension_support:       'no'
-    codacy:                    'yes'
-    codeclimate:               'yes'
-    codecov:                   'yes'
-    command_line_interface:    'no'
-    coveralls:                 'yes'
-    distribution_name:         'python-redis-lock'
-    email:                     'contact@ionelmc.ro'
-    full_name:                 'Ionel Cristian Mărieș'
-    github_username:           'ionelmc'
-    landscape:                 'yes'
-    package_name:              'redis_lock'
-    project_name:              'redis-lock'
-    project_short_description: 'Lock context manager implemented via redis SETNX/BLPOP.'
-    release_date:              '2015-08-19'
-    repo_name:                 'python-redis-lock'
-    requiresio:                'yes'
-    scrutinizer:               'yes'
-    sphinx_theme:              'sphinx-py3doc-enhanced-theme'
-    test_matrix_configurator:  'yes'
-    test_runner:               'pytest'
-    travis:                    'yes'
-    version:                   '2.2.0'
-    website:                   'http://blog.ionelmc.ro'
-    year:                      '2013-2015'
+cookiecutter:
+    appveyor: 'no'
+    bin_name: nameless
+    c_extension_cython: 'no'
+    c_extension_optional: 'no'
+    c_extension_support: 'no'
+    codacy: 'yes'
+    codeclimate: 'yes'
+    codecov: 'yes'
+    command_line_interface: 'no'
+    coveralls: 'yes'
+    distribution_name: python-redis-lock
+    email: contact@ionelmc.ro
+    full_name: Ionel Cristian Mărieș
+    github_username: ionelmc
+    landscape: 'yes'
+    package_name: redis_lock
+    project_name: redis-lock
+    project_short_description: Lock context manager implemented via redis SETNX/BLPOP.
+    release_date: today
+    repo_name: python-redis-lock
+    requiresio: 'yes'
+    scrutinizer: 'yes'
+    sphinx_theme: sphinx-py3doc-enhanced-theme
+    test_matrix_configurator: 'yes'
+    test_runner: pytest
+    travis: 'yes'
+    version: 2.2.0
+    website: http://blog.ionelmc.ro
+    year: 2013-2015

.editorconfig

@@ -0,0 +1,13 @@
+# see http://editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+charset = utf-8
+
+[*.{bat,cmd,ps1}]
+end_of_line = crlf

.gitignore

@@ -59,4 +59,5 @@ docs/_build
 .cache
 .pytest
 .bootstrap
+.appveyor.token
 *.bak

.travis.yml

@@ -1,11 +1,13 @@
 language: python
-python: 2.7
+python: '3.5'
 sudo: false
 env:
   global:
-    LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
+    - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
+    - SEGFAULT_SIGNALS=all
   matrix:
     - TOXENV=check
+
     - TOXENV=2.6-1.4,coveralls,codecov
     - TOXENV=2.6-1.4-nocover
     - TOXENV=2.6-1.5,coveralls,codecov
@@ -38,6 +40,10 @@ env:
     - TOXENV=3.4-1.7-nocover
     - TOXENV=3.4-1.8,coveralls,codecov
     - TOXENV=3.4-1.8-nocover
+    - TOXENV=3.5-1.7,coveralls,codecov
+    - TOXENV=3.5-1.7-nocover
+    - TOXENV=3.5-1.8,coveralls,codecov
+    - TOXENV=3.5-1.8-nocover
     - TOXENV=pypy-1.4,coveralls,codecov
     - TOXENV=pypy-1.4-nocover
     - TOXENV=pypy-1.5,coveralls,codecov
@@ -63,6 +69,11 @@ script:
 after_failure:
   - more .tox/log/* | cat
   - more .tox/*/log/* | cat
+before_cache:
+  - rm -rf $HOME/.cache/pip/log
+cache:
+  directories:
+    - $HOME/.cache/pip
 notifications:
   email:
     on_success: never

MANIFEST.in

@@ -9,6 +9,7 @@ include .coveragerc
 include .cookiecutterrc
 include .isort.cfg
 include .pylintrc
+include .editorconfig
 
 include AUTHORS.rst
 include CHANGELOG.rst

README.rst

@@ -1,14 +1,16 @@
-==========
-redis-lock
-==========
+========
+Overview
+========
+
+.. start-badges
 
 .. list-table::
     :stub-columns: 1
 
     * - docs
       - |docs|
     * - tests
-      - | |travis| |appveyor| |requires|
+      - | |travis| |requires|
         | |coveralls| |codecov|
         | |landscape| |scrutinizer| |codacy| |codeclimate|
     * - package
@@ -22,10 +24,6 @@ redis-lock
     :alt: Travis-CI Build Status
     :target: https://travis-ci.org/ionelmc/python-redis-lock
 
-.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/github/ionelmc/python-redis-lock?branch=master&svg=true
-    :alt: AppVeyor Build Status
-    :target: https://ci.appveyor.com/project/ionelmc/python-redis-lock
-
 .. |requires| image:: https://requires.io/github/ionelmc/python-redis-lock/requirements.svg?branch=master
     :alt: Requirements Status
     :target: https://requires.io/github/ionelmc/python-redis-lock/requirements/?branch=master
@@ -73,6 +71,8 @@ redis-lock
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-redis-lock/
 
+.. end-badges
+
 Lock context manager implemented via redis SETNX/BLPOP.
 
 * Free software: BSD license

ci/bootstrap.py

@@ -31,14 +31,17 @@
     exec(compile(open(activate, "rb").read(), activate, "exec"), dict(__file__=activate))
 
     import jinja2
+
     import matrix
 
+
     jinja = jinja2.Environment(
         loader=jinja2.FileSystemLoader(join(base_path, "ci", "templates")),
         trim_blocks=True,
         lstrip_blocks=True,
         keep_trailing_newline=True
     )
+
     tox_environments = {}
     for (alias, conf) in matrix.from_file(join(base_path, "setup.cfg")).items():
         python = conf["python_versions"]
@@ -57,6 +60,7 @@
         if "environment_variables" in conf:
             tox_environments[alias].update(env_vars=env_vars.split())
 
+
     for name in os.listdir(join("ci", "templates")):
         with open(join(base_path, name), "w") as fh:
             fh.write(jinja.get_template(name).render(tox_environments=tox_environments))

ci/templates/.travis.yml

@@ -1,15 +1,16 @@
 language: python
-python: 2.7
+python: '3.5'
 sudo: false
 env:
   global:
-    LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
+    - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
+    - SEGFAULT_SIGNALS=all
   matrix:
     - TOXENV=check
-{% for env, config in tox_environments|dictsort %}
-    - TOXENV={{ env }}{% if config.cover %},coveralls,codecov{% endif %}
-
+{% for env, config in tox_environments|dictsort %}{{ '' }}
+    - TOXENV={{ env }}{% if config.cover %},coveralls,codecov{% endif -%}
 {% endfor %}
+
 before_install:
   - python --version
   - uname -a
@@ -25,6 +26,11 @@ script:
 after_failure:
   - more .tox/log/* | cat
   - more .tox/*/log/* | cat
+before_cache:
+  - rm -rf $HOME/.cache/pip/log
+cache:
+  directories:
+    - $HOME/.cache/pip
 notifications:
   email:
     on_success: never

ci/templates/tox.ini

@@ -9,6 +9,9 @@ envlist =
     docs
 
 [testenv]
+basepython =
+    {docs,spell}: python2.7
+    {clean,check,report,extension-coveralls,coveralls,codecov}: python3.5
 setenv =
     PYTHONPATH={toxinidir}/tests
     PYTHONUNBUFFERED=yes
@@ -28,7 +31,7 @@ setenv =
 commands =
     sphinx-build -b spelling docs dist/docs
 skip_install = true
-usedevelop = true
+usedevelop = false
 deps =
     -r{toxinidir}/docs/requirements.txt
     sphinxcontrib-spelling
@@ -53,19 +56,18 @@ passenv =
     *
 
 [testenv:check]
-basepython = python3.4
 deps =
     docutils
     check-manifest
     flake8
-    readme
+    readme-renderer
     pygments
 skip_install = true
 usedevelop = false
 commands =
     python setup.py check --strict --metadata --restructuredtext
     check-manifest {toxinidir}
-    flake8 src tests
+    flake8 src tests setup.py
 
 [testenv:coveralls]
 deps =
@@ -90,7 +92,6 @@ commands =
 
 
 [testenv:report]
-basepython = python3.4
 deps = coverage
 skip_install = true
 usedevelop = false

docs/conf.py

@@ -11,7 +11,8 @@
     'sphinx.ext.coverage',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.napoleon'
+    'sphinx.ext.napoleon',
+    'sphinx.ext.extlinks',
 ]
 if os.getenv('SPELLCHECK'):
     extensions += 'sphinxcontrib.spelling',
@@ -25,19 +26,28 @@
 author = 'Ionel Cristian Mărieș'
 copyright = '{0}, {1}'.format(year, author)
 version = release = '2.3.0'
+
+pygments_style = 'trac'
+templates_path = ['.']
+extlinks = {
+    'issue': ('https://github.com/ionelmc/python-redis-lock/issues/%s', '#'),
+    'pr': ('https://github.com/ionelmc/python-redis-lock/pull/%s', 'PR #'),
+}
 import sphinx_py3doc_enhanced_theme
 html_theme = "sphinx_py3doc_enhanced_theme"
 html_theme_path = [sphinx_py3doc_enhanced_theme.get_html_theme_path()]
 html_theme_options = {
     'githuburl': 'https://github.com/ionelmc/python-redis-lock/'
 }
 
-pygments_style = 'trac'
-templates_path = ['.']
 html_use_smartypants = True
 html_last_updated_fmt = '%b %d, %Y'
 html_split_index = True
 html_sidebars = {
    '**': ['searchbox.html', 'globaltoc.html', 'sourcelink.html'],
 }
 html_short_title = '%s-%s' % (project, version)
+
+napoleon_use_ivar = True
+napoleon_use_rtype = False
+napoleon_use_param = False

docs/index.rst

@@ -1,7 +1,6 @@
-Welcome to redis-lock's documentation!
-========================================
-
-Contents:
+========
+Contents
+========
 
 .. toctree::
    :maxdepth: 2

docs/readme.rst

@@ -1,5 +1 @@
-########
-Overview
-########
-
 .. include:: ../README.rst

docs/requirements.txt

@@ -1,4 +1,3 @@
-sphinx
-sphinxcontrib-napoleon
+sphinx>=1.3
 sphinx-py3doc-enhanced-theme
 -e .

docs/usage.rst

@@ -51,13 +51,9 @@ The above example could be rewritten using context manager::
         time.sleep(5)
 
 In cases, where lock not necessarily in acquired state, and
-user need to ensure, that it's released, ``force`` parameter could be used::
-
-    lock = Lock(conn, "foo")
-    try:
-      if lock.acquire(block=False):
-        print("Got the lock. Do crazy dance")
-      else:
-        print("Didn't get the lock. Do normal dance")
-    finally:
-      lock.release(force=True)
+user need to ensure, that it has a matching ``id``, example::
+
+    lock1 = Lock(conn, "foo")
+    lock1.acquire()
+    lock2 = Lock(conn, "foo", id=lock1.id)
+    lock2.release()

setup.cfg

@@ -65,6 +65,7 @@ python_versions =
     2.7
     3.3
     3.4
+    3.5
     pypy
 
 dependencies =
@@ -73,8 +74,8 @@ dependencies =
     1.6: redis==2.10.3 &python_versions[2.6]
 
     1.4: django-redis==3.8.4 redis==2.10.3 Django==1.4.22 !python_versions[3.*] !python_versions[2.6]
-    1.5: django-redis==3.8.4 redis==2.10.3 Django==1.5.12 !python_versions[2.6]
-    1.6: django-redis==3.8.4 redis==2.10.3 Django==1.6.11 !python_versions[2.6]
+    1.5: django-redis==3.8.4 redis==2.10.3 Django==1.5.12 !python_versions[2.6] !python_versions[3.5]
+    1.6: django-redis==3.8.4 redis==2.10.3 Django==1.6.11 !python_versions[2.6] !python_versions[3.5]
 
     1.7: django-redis==3.8.4 redis==2.10.3 Django==1.7.10 !python_versions[2.6]
     1.8: django-redis==4.2.0 redis==2.10.3 Django==1.8.4 !python_versions[2.6]