Merge branch 'master' into rm-eol

.travis.yml

@@ -5,8 +5,7 @@ python:
   - 3.5
   - 3.6
   - pypy
-  # Disabled because PyYAML is failing to compile against it
-  # - nightly
+  - nightly
 matrix:
   include:
     - python: 3.7

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2011 James Saryerwinnie, 2017 Bruce Merry
+Copyright (c) 2011 James Saryerwinnie, 2017-2018 Bruce Merry
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -22,3 +22,30 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This software contains portions of code from redis-py, which is distributed
+under the following license:
+
+Copyright (c) 2012 Andy McCurdy
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS 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.

Pipfile

@@ -0,0 +1,15 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[dev-packages]
+tox = "*"
+nose = "==1.3.4"
+
+[packages]
+"flake8" = "<3.0.0"
+redis = "==2.10.6"
+lupa = "==1.6"
+future = "==0.16.0"

README.rst

@@ -16,6 +16,20 @@ many times you want to write unittests that do not talk to an external server
 (such as redis).  This module now allows tests to simply use this
 module as a reasonable substitute for redis.
 
+Note on redis-py 3
+==================
+
+redis-py 3 is a recent backwards-compatible update to redis-py. It is not yet
+supported by fakeredis, which only implements the redis-py 2 API.
+
+If you need to run unit tests against the redis-py 3 API, take a look at
+birdisle_. It embeds the redis server code into your process and supports
+redis-py 2 and 3. It is also a more accurate emulation of redis, because it
+is using the actual redis codebase. The downside is that it currently only
+supports Linux.
+
+.. _birdisle: https://birdisle.readthedocs.io/en/latest/
+
 
 How to Use
 ==========
@@ -116,7 +130,6 @@ server
 ------
 
  * bgrewriteaof
- * bgsave
  * client kill
  * client list
  * client getname
@@ -135,7 +148,6 @@ server
  * debug object
  * debug segfault
  * info
- * lastsave
  * memory doctor
  * memory help
  * memory malloc-stats
@@ -144,7 +156,6 @@ server
  * memory usage
  * monitor
  * role
- * save
  * shutdown
  * slaveof
  * slowlog
@@ -294,6 +305,33 @@ they have all been tagged as 'slow' so you can skip them by running::
 Revision history
 ================
 
+0.16.0
+------
+- `#224 <https://github.com/jamesls/fakeredis/pull/224>`_ Add __delitem__
+- Restrict to redis<3
+
+0.15.0
+------
+- `#219 <https://github.com/jamesls/fakeredis/pull/219>`_ Add SAVE, BGSAVE and LASTSAVE commands
+- `#222 <https://github.com/jamesls/fakeredis/pull/222>`_ Fix deprecation warnings in Python 3.7
+
+0.14.0
+------
+This release greatly improves support for threads: the bulk of commands are now
+thread-safe, ``lock`` has been rewritten to more closely match redis-py, and
+pubsub now supports ``run_in_thread``:
+
+- `#213 <https://github.com/jamesls/fakeredis/issues/217>`_ pipeline.watch runs transaction even if no commands are queued
+- `#214 <https://github.com/jamesls/fakeredis/pull/214>`_ Added pubsub.run_in_thread as it is implemented in redis-py
+- `#215 <https://github.com/jamesls/fakeredis/pull/215>`_ Keep pace with redis-py for zrevrange method
+- `#216 <https://github.com/jamesls/fakeredis/pull/216>`_ Update behavior of lock to behave closer to redis lock
+
+0.13.1
+------
+- `#208 <https://github.com/jamesls/fakeredis/pull/208>`_ eval's KEYS and ARGV are now lua tables
+- `#209 <https://github.com/jamesls/fakeredis/pull/209>`_ Redis operation that returns dict now converted to Lua table when called inside eval operation
+- `#212 <https://github.com/jamesls/fakeredis/pull/212>`_ Optimize ``_scan()``
+
 0.13.0.1
 --------
 - Fix a typo in the Trove classifiers