diff --git a/Makefile b/Makefile index dd2c2695..03369342 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,6 @@ develop: update-submodules setup-git npm install pip install "setuptools>=0.9.8" # order matters here, base package must install first - # this is temporary until the version we need is released - pip install -e 'git+https://git@github.com/pyca/cryptography.git#egg=cryptography-1.0.dev1' pip install -e . pip install "file://`pwd`#egg=lemur[dev]" pip install "file://`pwd`#egg=lemur[tests]" diff --git a/setup.py b/setup.py index ea7ef326..0e15ea76 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ install_requires = [ 'six==1.9.0', 'gunicorn==19.3.0', 'pycrypto==2.6.1', - 'cryptography>=1.0dev', + 'cryptography==1.0', 'pyopenssl==0.15.1', 'pyjwt==1.0.1', 'xmltodict==0.9.2',