From 66df3d4291bc689fd47cc9885415ae73bb0951a0 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Thu, 23 Jul 2015 12:16:56 -0700 Subject: [PATCH] Moving the temporary asset to the makefile instead of setup.py --- Makefile | 2 ++ setup.cfg | 2 +- setup.py | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 03369342..399ac942 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ 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@1.0.dev1#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.cfg b/setup.cfg index a1e4f550..fe08c7bf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,4 +9,4 @@ max-line-length = 100 exclude = .tox,.git,*/migrations/*,lemur/static/*,docs/* [wheel] -universal = 1 \ No newline at end of file +universal = 1 diff --git a/setup.py b/setup.py index cec4ad78..5fe92052 100644 --- a/setup.py +++ b/setup.py @@ -139,9 +139,6 @@ setup( 'aws_source = lemur.plugins.lemur_aws.plugin:AWSSourcePlugin' ], }, - dependency_links=[ - "git+ssh://git@github.com/pyca/cryptography.git@1.0.dev1#egg=cryptography-1.0.dev1" - ], classifiers=[ 'Framework :: Flask', 'Intended Audience :: Developers',