Skip to content

Commit

Permalink
[AIRFLOW-895] Address Apache release incompliancies
Browse files Browse the repository at this point in the history
* Fixes missing licenses in NOTICE
* Corrects license header
* Removes HighCharts left overs.

Closes apache#2098 from bolkedebruin/AIRFLOW-895
  • Loading branch information
bolkedebruin committed Feb 23, 2017
1 parent 1c4508d commit 784b363
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 241 deletions.
9 changes: 8 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include NOTICE
include LICENSE
include DISCLAIMER
include CHANGELOG.txt
include README.md
graft airflow/www/templates
graft airflow/www/static
include airflow/alembic.ini
include requirements.txt
graft scripts/systemd
graft scripts/upstart

6 changes: 4 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ This product includes WebGL-2D.js (https://github.com/gameclosure/webgl-2d), Cop
This product includes Bootstrap (http://getbootstrap.com - MIT license), Copyright (c) 2011-2016 Twitter, Inc.
This product includes Bootstrap Toggle (http://www.bootstraptoggle.com - MIT license), Copyright 2014 Min Hur, The New York Times Company.
This product includes Clock plugin (https://github.com/Lwangaman/jQuery-Clock-Plugin - Dual licensed under the MIT and GPL licenses), Copyright (c) 2010 John R D'Orazio ([email protected])
This product includes DataTables (datatables.net - datatables.net/license), Copyright © 2008-2015 SpryMedia Ltd.
This product includes DataTables (datatables.net - MIT License), Copyright © 2008-2015 SpryMedia Ltd.
This product includes Underscore.js (http://underscorejs.org - MIT license), Copyright (c) 2011-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors.
This product includes FooTable (http://fooplugins.com/plugins/footable-jquery/ - MIT license), Copyright 2013 Steven Usher & Brad Vincent.
This product includes dagre (https://github.com/cpettitt/dagre - MIT license), Copyright (c) 2012-2014 Chris Pettitt.
This product includes d3js (https://d3js.org/ - https://github.com/mbostock/d3/blob/master/LICENSE), Copyright (c) 2010-2016, Michael Bostock.
This product includes d3js (https://d3js.org/ - BSD License), Copyright (c) 2010-2016, Michael Bostock.
This product includes flask-kerberos (https://github.com/mkomitee/flask-kerberos - BSD License), Copyright (c) 2013, Michael Komitee
This product includes ace (https://github.com/ajaxorg/ace - BSD License), Copyright (c) 2010, Ajax.org B.V.
This product includes d3 tip (https://github.com/Caged/d3-tip - MIT License), Copyright (c) 2013-2017 Justin Palmer
35 changes: 19 additions & 16 deletions airflow/www/static/d3.tip.v0.6.3.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* The MIT License (MIT)
* Copyright (c) 2013 Justin Palmer
*
* 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.
*/

// d3.tip
Expand Down
3 changes: 2 additions & 1 deletion airflow/www/static/dagre-d3.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
;(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
var global=self;/**
var global=self;
/**
* @license
* Copyright (c) 2012-2013 Chris Pettitt
*
Expand Down
194 changes: 0 additions & 194 deletions airflow/www/static/heatmap-canvas.js

This file was deleted.

23 changes: 0 additions & 23 deletions airflow/www/static/heatmap.js

This file was deleted.

Binary file removed airflow/www/static/nvd3.tar.gz
Binary file not shown.
Loading

0 comments on commit 784b363

Please sign in to comment.