Merge pull request #81 from kevgliss/pipy

Minor fixes
This commit is contained in:
kevgliss 2015-09-18 15:56:06 -07:00
commit aa76379d6c
6 changed files with 25 additions and 9 deletions

View File

@ -19,8 +19,7 @@ Lemur
Lemur manages SSL certificate creation. It provides a central portal for developers to issuer their own SSL certificates with 'sane' defaults. Lemur manages SSL certificate creation. It provides a central portal for developers to issuer their own SSL certificates with 'sane' defaults.
It works on CPython 2.7, 3.3, 3.4 It is known It works on CPython 2.7, 3.3, 3.4. We deploy on Ubuntu and develop on OS X.
to work on Ubuntu Linux and OS X.
Project resources Project resources
================= =================

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# security_monkey documentation build configuration file, created by # lemur documentation build configuration file, created by
# sphinx-quickstart on Sat Jun 7 18:43:48 2014. # sphinx-quickstart on Sat Jun 7 18:43:48 2014.
# #
# This file is execfile()d with the current directory set to its # This file is execfile()d with the current directory set to its

View File

@ -125,7 +125,7 @@ class Ping(Resource):
args = self.reqparse.parse_args() args = self.reqparse.parse_args()
# take the information we have received from Meechum to create a new request # take the information we have received from the provider to create a new request
params = { params = {
'client_id': args['clientId'], 'client_id': args['clientId'],
'grant_type': 'authorization_code', 'grant_type': 'authorization_code',
@ -138,7 +138,7 @@ class Ping(Resource):
access_token_url = current_app.config.get('PING_ACCESS_TOKEN_URL') access_token_url = current_app.config.get('PING_ACCESS_TOKEN_URL')
user_api_url = current_app.config.get('PING_USER_API_URL') user_api_url = current_app.config.get('PING_USER_API_URL')
# the secret and cliendId will be given to you when you signup for meechum # the secret and cliendId will be given to you when you signup for the provider
basic = base64.b64encode('{0}:{1}'.format(args['clientId'], current_app.config.get("PING_SECRET"))) basic = base64.b64encode('{0}:{1}'.format(args['clientId'], current_app.config.get("PING_SECRET")))
headers = {'Authorization': 'Basic {0}'.format(basic)} headers = {'Authorization': 'Basic {0}'.format(basic)}
@ -220,7 +220,7 @@ class Ping(Resource):
profile['email'], profile['email'],
profile['email'], profile['email'],
True, True,
profile.get('thumbnailPhotoUrl'), # Encase profile isn't google+ enabled profile.get('thumbnailPhotoUrl'), # incase profile isn't google+ enabled
roles roles
) )

View File

@ -10,7 +10,7 @@
Owner Owner
</label> </label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="email" name="owner" ng-model="certificate.owner" placeholder="owner@netflix.com" <input type="email" name="owner" ng-model="certificate.owner" placeholder="owner@example.com"
class="form-control" required/> class="form-control" required/>
<p ng-show="editForm.owner.$invalid && !editForm.owner.$pristine" class="help-block">Enter a valid <p ng-show="editForm.owner.$invalid && !editForm.owner.$pristine" class="help-block">Enter a valid

View File

@ -10,3 +10,6 @@ exclude = .tox,.git,*/migrations/*,lemur/static/*,docs/*
[wheel] [wheel]
universal = 1 universal = 1
[metadata]
description-file = README.rst

View File

@ -9,7 +9,9 @@ Is an SSL management and orchestration tool.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import json
import os.path import os.path
import datetime
from distutils import log from distutils import log
from distutils.core import Command from distutils.core import Command
@ -87,9 +89,18 @@ class DevelopWithBuildStatic(develop):
class SdistWithBuildStatic(sdist): class SdistWithBuildStatic(sdist):
def make_distribution(self): def make_release_tree(self, *a, **kw):
dist_path = self.distribution.get_fullname()
sdist.make_release_tree(self, *a, **kw)
self.reinitialize_command('build_static', work_path=dist_path)
self.run_command('build_static') self.run_command('build_static')
return sdist.make_distribution(self)
with open(os.path.join(dist_path, 'lemur-package.json'), 'w') as fp:
json.dump({
'createdAt': datetime.datetime.utcnow().isoformat() + 'Z',
}, fp)
class BuildStatic(Command): class BuildStatic(Command):
@ -114,6 +125,9 @@ setup(
version='0.1.3', version='0.1.3',
author='Kevin Glisson', author='Kevin Glisson',
author_email='kglisson@netflix.com', author_email='kglisson@netflix.com',
url='https://github.com/netflix/lemur',
download_url='https://github.com/Netflix/lemur/archive/0.1.3.tar.gz',
description='Certificate management and orchestration service',
long_description=open(os.path.join(ROOT, 'README.rst')).read(), long_description=open(os.path.join(ROOT, 'README.rst')).read(),
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,