Skip to content

Commit

Permalink
Merge pull request #81 from kevgliss/pipy
Browse files Browse the repository at this point in the history
Minor fixes
  • Loading branch information
kevgliss committed Sep 18, 2015
2 parents e2962a4 + ef72de8 commit aa76379
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 9 deletions.
3 changes: 1 addition & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

It works on CPython 2.7, 3.3, 3.4 It is known
to work on Ubuntu Linux and OS X.
It works on CPython 2.7, 3.3, 3.4. We deploy on Ubuntu and develop on OS X.

Project resources
=================
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- 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.
#
# This file is execfile()d with the current directory set to its
Expand Down
6 changes: 3 additions & 3 deletions lemur/auth/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def post(self):

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 = {
'client_id': args['clientId'],
'grant_type': 'authorization_code',
Expand All @@ -138,7 +138,7 @@ def post(self):
access_token_url = current_app.config.get('PING_ACCESS_TOKEN_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")))
headers = {'Authorization': 'Basic {0}'.format(basic)}

Expand Down Expand Up @@ -220,7 +220,7 @@ def post(self):
profile['email'],
profile['email'],
True,
profile.get('thumbnailPhotoUrl'), # Encase profile isn't google+ enabled
profile.get('thumbnailPhotoUrl'), # incase profile isn't google+ enabled
roles
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h3 class="modal-header">Edit <span class="text-muted"><small>{{ certificate.nam
Owner
</label>
<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/>

<p ng-show="editForm.owner.$invalid && !editForm.owner.$pristine" class="help-block">Enter a valid
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ exclude = .tox,.git,*/migrations/*,lemur/static/*,docs/*

[wheel]
universal = 1

[metadata]
description-file = README.rst
18 changes: 16 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"""
from __future__ import absolute_import

import json
import os.path
import datetime

from distutils import log
from distutils.core import Command
Expand Down Expand Up @@ -87,9 +89,18 @@ def install_for_development(self):


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')
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):
Expand All @@ -114,6 +125,9 @@ def run(self):
version='0.1.3',
author='Kevin Glisson',
author_email='[email protected]',
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(),
packages=find_packages(),
include_package_data=True,
Expand Down

0 comments on commit aa76379

Please sign in to comment.