Prepare a v1.6 release

jvarho · Jan 4, 2017 · cce4ec2 · cce4ec2
1 parent 86001a9
commit cce4ec2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,13 +3,13 @@ Release History
 
 1.6.0
 --
-???
+2017-01-04
 
 Feature release:
+- Use hashlib.scrypt on Python 3.6 + OpenSSL 1.1
 - Travis CI integration
 - Improved test coverage
 - Code and build cleanups
-- Bug fixes from 1.5.x
 
 
 1.5.3

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016, Jan Varho
+Copyright (c) 2014-2017, Jan Varho
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

diff --git a/README b/README
@@ -10,9 +10,10 @@ everything that I'd like, so here's One More[1].
 
 Features
 --
-* Uses system libscrypt[2] as the first choice.
-* If that isn't available, tries the scrypt Python module[3] or libsodium[4].
-* Offers a pure Python scrypt implementation for when there's no C scrypt.
+* Uses hashlib.scrypt on Python 3.6 and OpenSSL 1.1.
+* Uses system libscrypt[2] as the next choice.
+* If neither is available, tries the scrypt Python module[3] or libsodium[4].
+* Offers a pure Python scrypt implementation for when there is no C scrypt.
 * Not unusably slow, even in pure Python... at least with pypy[5].
 
 With PyPy as the interpreter the Python implementation is around one fifth the
@@ -26,6 +27,7 @@ Requirements
   - libscrypt 1.8+ (older may work)
   - py-scrypt 0.6+ (pip install scrypt)
   - libsodium 0.6+
+  - Python 3.6+ with OpenSSL 1.1+
 
 
 Usage

diff --git a/pylibscrypt/__init__.py b/pylibscrypt/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2016, Jan Varho
+# Copyright (c) 2014-2017, Jan Varho
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 
 """Scrypt for Python"""
 
-__version__ = '1.6.0-git'
+__version__ = '1.6.0'
 
 # First, try hashlib
 _done = False

diff --git a/pylibscrypt/hashlibscrypt.py b/pylibscrypt/hashlibscrypt.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, Jan Varho
+# Copyright (c) 2016-2017, Jan Varho
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/pylibscrypt/tests.py b/pylibscrypt/tests.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2016, Jan Varho
+# Copyright (c) 2014-2017, Jan Varho
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above