Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving the temporary asset to the makefile instead of setup.py

This commit is contained in:
kevgliss 2015-07-23 12:16:56 -07:00
parent 919a8e231d
commit 66df3d4291
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -6,6 +6,8 @@ develop: update-submodules setup-git
npm install npm install
pip install "setuptools>=0.9.8" pip install "setuptools>=0.9.8"
# order matters here, base package must install first # 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 -e .
pip install "file://`pwd`#egg=lemur[dev]" pip install "file://`pwd`#egg=lemur[dev]"
pip install "file://`pwd`#egg=lemur[tests]" pip install "file://`pwd`#egg=lemur[tests]"

2
setup.cfg
View File

@ -9,4 +9,4 @@ max-line-length = 100
exclude = .tox,.git,*/migrations/*,lemur/static/*,docs/* exclude = .tox,.git,*/migrations/*,lemur/static/*,docs/*
[wheel] [wheel]
universal = 1 universal = 1

3
setup.py
View File

@ -139,9 +139,6 @@ setup(
'aws_source = lemur.plugins.lemur_aws.plugin:AWSSourcePlugin' '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=[ classifiers=[
'Framework :: Flask', 'Framework :: Flask',
'Intended Audience :: Developers', 'Intended Audience :: Developers',