From f648fb298134eeb248e85aa6c9c12a7fa6af40bb 2016-06-29 14:07:18 From: Marcin Lulek Date: 2016-06-29 14:07:18 Subject: [PATCH] setuptools: versioning and licensing updated --- diff --git a/backend/setup.py b/backend/setup.py index c01afef..f93be66 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -19,13 +19,29 @@ def parse_req(req): requires = [_f for _f in map(parse_req, REQUIREMENTS) if _f] -if sys.version_info[:3] < (2, 5, 0): - requires.append('pysqlite') + +def _get_meta_var(name, data, callback_handler=None): + import re + matches = re.compile(r'(?:%s)\s*=\s*(.*)' % name).search(data) + if matches: + if not callable(callback_handler): + callback_handler = lambda v: v + + return callback_handler(eval(matches.groups()[0])) + +with open(os.path.join(here, 'src', 'appenlight', '__init__.py'), 'r') as _meta: + _metadata = _meta.read() + +with open(os.path.join('src', 'appenlight', 'VERSION')) as _meta_version: + __version__ = _meta_version.read().strip() + +__license__ = _get_meta_var('__license__', _metadata) +__author__ = _get_meta_var('__author__', _metadata) +__url__ = _get_meta_var('__url__', _metadata) found_packages = find_packages('src') found_packages.append('appenlight.migrations.versions') setup(name='appenlight', - version='0.1', description='appenlight', long_description=README + '\n\n' + CHANGES, classifiers=[ @@ -34,9 +50,10 @@ setup(name='appenlight', "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], - author='', - author_email='', - url='', + version=__version__, + license=__license__, + author=__author__, + url=__url__, keywords='web wsgi bfg pylons pyramid', package_dir={'': 'src'}, packages=found_packages, diff --git a/backend/src/appenlight/VERSION b/backend/src/appenlight/VERSION new file mode 100644 index 0000000..ac39a10 --- /dev/null +++ b/backend/src/appenlight/VERSION @@ -0,0 +1 @@ +0.9.0 diff --git a/backend/src/appenlight/__init__.py b/backend/src/appenlight/__init__.py index 664767d..4fc087d 100644 --- a/backend/src/appenlight/__init__.py +++ b/backend/src/appenlight/__init__.py @@ -48,6 +48,10 @@ from appenlight.lib import cache_regions from appenlight.lib.ext_json import json from appenlight.security import groupfinder, AuthTokenAuthenticationPolicy +__license__ = 'AGPLv3, and Commercial License' +__author__ = 'RhodeCode GmbH' +__url__ = 'http://rhodecode.com' + json_renderer = JSON(serializer=json.dumps, indent=4) log = logging.getLogger(__name__) diff --git a/backend/src/appenlight/static/js/appenlight.js b/backend/src/appenlight/static/js/appenlight.js index 69767ac..d457b1c 100644 --- a/backend/src/appenlight/static/js/appenlight.js +++ b/backend/src/appenlight/static/js/appenlight.js @@ -1795,129 +1795,129 @@ return{compile:function(a,b){var c=f(t);return function(a,b,d,f){function j(){N. } }; }); -;//Copyright (C) 2012 Kory Nunn - -//Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -//The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -/* - - This code is not formatted for readability, but rather run-speed and to assist compilers. - - However, the code's intention should be transparent. - - *** IE SUPPORT *** - - If you require this library to work in IE7, add the following after declaring crel. - - var testDiv = document.createElement('div'), - testLabel = document.createElement('label'); - - testDiv.setAttribute('class', 'a'); - testDiv['className'] !== 'a' ? crel.attrMap['class'] = 'className':undefined; - testDiv.setAttribute('name','a'); - testDiv['name'] !== 'a' ? crel.attrMap['name'] = function(element, value){ - element.id = value; - }:undefined; - - - testLabel.setAttribute('for', 'a'); - testLabel['htmlFor'] !== 'a' ? crel.attrMap['for'] = 'htmlFor':undefined; - - - -*/ - -(function (root, factory) { - if (typeof exports === 'object') { - if (!root.window) { - var jsdom = require('jsdom').jsdom; - root.window = jsdom().parentWindow; - } - module.exports = factory(root.window); - } else if (typeof define === 'function' && define.amd) { - define(factory.bind(null, window)); - } else { - root.crel = factory(root.window); - } -}(this, function (window) { - // based on http://stackoverflow.com/questions/384286/javascript-isdom-how-do-you-check-if-a-javascript-object-is-a-dom-object - var isNode = typeof Node === 'object' - ? function (object) { return object instanceof Node } - : function (object) { - return object - && typeof object === 'object' - && typeof object.nodeType === 'number' - && typeof object.nodeName === 'string'; - }; - - function crel(){ - var document = window.document, - args = arguments, //Note: assigned to a variable to assist compilers. Saves about 40 bytes in closure compiler. Has negligable effect on performance. - element = document.createElement(args[0]), - child, - settings = args[1], - childIndex = 2, - argumentsLength = args.length, - attributeMap = crel.attrMap; - - // shortcut - if(argumentsLength === 1){ - return element; - } - - if(typeof settings !== 'object' || isNode(settings)) { - --childIndex; - settings = null; - } - - // shortcut if there is only one child that is a string - if((argumentsLength - childIndex) === 1 && typeof args[childIndex] === 'string' && element.textContent !== undefined){ - element.textContent = args[childIndex]; - }else{ - for(; childIndex < argumentsLength; ++childIndex){ - child = args[childIndex]; - - if(child == null){ - continue; - } - - if(!isNode(child)){ - child = document.createTextNode(child); - } - - element.appendChild(child); - } - } - - for(var key in settings){ - if(!attributeMap[key]){ - element.setAttribute(key, settings[key]); - }else{ - var attr = crel.attrMap[key]; - if(typeof attr === 'function'){ - attr(element, settings[key]); - }else{ - element.setAttribute(attr, settings[key]); - } - } - } - - return element; - } - - // Used for mapping one kind of attribute to the supported version of that in bad browsers. - // String referenced so that compilers maintain the property name. - crel['attrMap'] = {}; - - // String referenced so that compilers maintain the property name. - crel["isNode"] = isNode; - - return crel; -})); +;//Copyright (C) 2012 Kory Nunn + +//Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +//The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +/* + + This code is not formatted for readability, but rather run-speed and to assist compilers. + + However, the code's intention should be transparent. + + *** IE SUPPORT *** + + If you require this library to work in IE7, add the following after declaring crel. + + var testDiv = document.createElement('div'), + testLabel = document.createElement('label'); + + testDiv.setAttribute('class', 'a'); + testDiv['className'] !== 'a' ? crel.attrMap['class'] = 'className':undefined; + testDiv.setAttribute('name','a'); + testDiv['name'] !== 'a' ? crel.attrMap['name'] = function(element, value){ + element.id = value; + }:undefined; + + + testLabel.setAttribute('for', 'a'); + testLabel['htmlFor'] !== 'a' ? crel.attrMap['for'] = 'htmlFor':undefined; + + + +*/ + +(function (root, factory) { + if (typeof exports === 'object') { + if (!root.window) { + var jsdom = require('jsdom').jsdom; + root.window = jsdom().parentWindow; + } + module.exports = factory(root.window); + } else if (typeof define === 'function' && define.amd) { + define(factory.bind(null, window)); + } else { + root.crel = factory(root.window); + } +}(this, function (window) { + // based on http://stackoverflow.com/questions/384286/javascript-isdom-how-do-you-check-if-a-javascript-object-is-a-dom-object + var isNode = typeof Node === 'object' + ? function (object) { return object instanceof Node } + : function (object) { + return object + && typeof object === 'object' + && typeof object.nodeType === 'number' + && typeof object.nodeName === 'string'; + }; + + function crel(){ + var document = window.document, + args = arguments, //Note: assigned to a variable to assist compilers. Saves about 40 bytes in closure compiler. Has negligable effect on performance. + element = document.createElement(args[0]), + child, + settings = args[1], + childIndex = 2, + argumentsLength = args.length, + attributeMap = crel.attrMap; + + // shortcut + if(argumentsLength === 1){ + return element; + } + + if(typeof settings !== 'object' || isNode(settings)) { + --childIndex; + settings = null; + } + + // shortcut if there is only one child that is a string + if((argumentsLength - childIndex) === 1 && typeof args[childIndex] === 'string' && element.textContent !== undefined){ + element.textContent = args[childIndex]; + }else{ + for(; childIndex < argumentsLength; ++childIndex){ + child = args[childIndex]; + + if(child == null){ + continue; + } + + if(!isNode(child)){ + child = document.createTextNode(child); + } + + element.appendChild(child); + } + } + + for(var key in settings){ + if(!attributeMap[key]){ + element.setAttribute(key, settings[key]); + }else{ + var attr = crel.attrMap[key]; + if(typeof attr === 'function'){ + attr(element, settings[key]); + }else{ + element.setAttribute(attr, settings[key]); + } + } + } + + return element; + } + + // Used for mapping one kind of attribute to the supported version of that in bad browsers. + // String referenced so that compilers maintain the property name. + crel['attrMap'] = {}; + + // String referenced so that compilers maintain the property name. + crel["isNode"] = isNode; + + return crel; +})); ;/*globals define, module, require, document*/ (function (root, factory) { @@ -10994,6 +10994,7 @@ angular.module('appenlight.directives.appVersion', []). elm.text(version); }; }]) + ;// # Copyright (C) 2010-2016 RhodeCode GmbH // # // # This program is free software: you can redistribute it and/or modify @@ -11158,6 +11159,7 @@ directive('confirmValidate', [function () { } } }]) + ;// # Copyright (C) 2010-2016 RhodeCode GmbH // # // # This program is free software: you can redistribute it and/or modify @@ -11184,6 +11186,7 @@ angular.module('appenlight.directives.focus', []).directive('focus', function () }); } }); + ;// # Copyright (C) 2010-2016 RhodeCode GmbH // # // # This program is free software: you can redistribute it and/or modify @@ -11284,6 +11287,7 @@ directive('isoToRelativeTime', function () { } } }) + ;// # Copyright (C) 2010-2016 RhodeCode GmbH // # // # This program is free software: you can redistribute it and/or modify @@ -11981,6 +11985,7 @@ directive('smallReportGroupList', [function () { templateUrl: 'templates/reports/small_report_group_list.html' } }]) + ;// # Copyright (C) 2010-2016 RhodeCode GmbH // # // # This program is free software: you can redistribute it and/or modify @@ -12011,6 +12016,7 @@ angular.module('appenlight.directives.smallReportList', []). templateUrl: 'templates/reports/small_report_list.html' } }]) + ;// # Copyright (C) 2010-2016 RhodeCode GmbH // # // # This program is free software: you can redistribute it and/or modify @@ -12841,6 +12847,7 @@ angular.module('appenlight.services.UUIDProvider', []).factory('UUIDProvider', f }; return provider; }); + ;// # Copyright (C) 2010-2016 RhodeCode GmbH // # // # This program is free software: you can redistribute it and/or modify