aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-05-29 23:10:39 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-05-29 22:10:39 -0500
commitb90e8d81a3814331fafc732fa0f2d44f5f71dfbb (patch)
tree249aca2c9df033f85179a02037d9fd97cfe5f145 /src
parent23ead43fd70df17828937dac9521df1753ce9407 (diff)
downloadcryptography-b90e8d81a3814331fafc732fa0f2d44f5f71dfbb.tar.gz
cryptography-b90e8d81a3814331fafc732fa0f2d44f5f71dfbb.tar.bz2
cryptography-b90e8d81a3814331fafc732fa0f2d44f5f71dfbb.zip
Post release tasks to open master for 2.0 (#3644)
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--src/cryptography/utils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 25384598..1573f697 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "1.9"
+__version__ = "2.0.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py
index 16c05003..cb7137cc 100644
--- a/src/cryptography/utils.py
+++ b/src/cryptography/utils.py
@@ -15,7 +15,7 @@ import warnings
# ubiquity of their use. They should not be removed until we agree on when that
# cycle ends.
PersistentlyDeprecated = DeprecationWarning
-DeprecatedIn19 = PendingDeprecationWarning
+DeprecatedIn19 = DeprecationWarning
def read_only_property(name):