Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AIRFLOW-3697] Vendorize nvd3 and slugify #4513

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .flake8
@@ -1,3 +1,4 @@
[flake8]
max-line-length = 110
ignore = E731,W504
exclude = .svn,CVS,.bzr,.hg,.git,__pycache__,.tox,.eggs,*.egg,*/_vendor/*
3 changes: 3 additions & 0 deletions .rat-excludes
Expand Up @@ -59,3 +59,6 @@ coverage.xml
rat-results.txt
apache-airflow-.*\+source.tar.gz.*
apache-airflow-.*\+bin.tar.gz.*

# vendored modules
_vendor/*
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -24,7 +24,6 @@ python:
env:
global:
- DOCKER_COMPOSE_VERSION=1.20.0
- SLUGIFY_USES_TEXT_UNIDECODE=yes
- TRAVIS_CACHE=$HOME/.travis_cache/
matrix:
- TOX_ENV=py27-backend_mysql-env_docker
Expand Down
2 changes: 2 additions & 0 deletions LICENSE
Expand Up @@ -240,6 +240,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
(MIT License) normalize.css v3.0.2 (http://necolas.github.io/normalize.css/)
(MIT License) ElasticMock v1.3.2 (https://github.com/vrcmarcos/elasticmock)
(MIT License) MomentJS v2.22.2 (http://momentjs.com/)
(MIT License) python-slugify v2.0.1 (https://github.com/un33k/python-slugify)
(MIT License) python-nvd3 v0.15.0 (https://github.com/areski/python-nvd3)

========================================================================
BSD 2-Clause licenses
Expand Down
3 changes: 2 additions & 1 deletion MANIFEST.in
Expand Up @@ -24,9 +24,10 @@ graft licenses/
graft airflow/www
graft airflow/www/static
graft airflow/www/templates
graft airflow/www/translations
graft airflow/_vendor/
include airflow/alembic.ini
graft scripts/systemd
graft scripts/upstart
graft airflow/config_templates
recursive-exclude airflow/www/node_modules *
global-exclude __pycache__ *.pyc
12 changes: 12 additions & 0 deletions NOTICE
Expand Up @@ -17,3 +17,15 @@ This product contains a modified portion of 'Hue' developed by Cloudera, Inc.
(https://github.com/cloudera/hue/).

* Copyright 2009-2017 Cloudera Inc.

python-slugify:
---------------

* Copyright (c) Val Neekman @ Neekware Inc. http://neekware.com

python-nvd3:
------------

* Copyright (c) 2013 Arezqui Belaid <areski@gmail.com> and other contributors


13 changes: 13 additions & 0 deletions airflow/_vendor/README
@@ -0,0 +1,13 @@
Original files in this directory were created with the following commands::

mkdir -p slugify/
curl -fsSL -O https://files.pythonhosted.org/packages/1f/9c/8b07d625e9c9df567986d887f0375075abb1923e49d074a7803cd1527dae/python-slugify-2.0.1.tar.gz
tar -xzf python-slugify-*.tar.gz --strip-components=2 -C slugify/ '*/slugify/*'
tar -xzf python-slugify-*.tar.gz --strip-components=1 -C slugify/ '*/LICENSE'
rm *.tar.gz

mkdir -p nvd3/
curl -fsSL -O https://files.pythonhosted.org/packages/0b/aa/97165daa6e319409c5c2582e62736a7353bda3c90d90fdcb0b11e116dd2d/python-nvd3-0.15.0.tar.gz
tar -xzf python-nvd3-*.tar.gz --strip-components=2 -C nvd3/ '*/nvd3/*'
tar -xzf python-nvd3-*.tar.gz --strip-components=1 -C nvd3/ '*/LICENSE'
rm *.tar.gz
18 changes: 18 additions & 0 deletions airflow/_vendor/__init__.py
@@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
#
# 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.
24 changes: 24 additions & 0 deletions airflow/_vendor/nvd3/LICENSE
@@ -0,0 +1,24 @@
The MIT License (MIT)

Python-nvd3

Copyright (c) 2013 Arezqui Belaid <areski@gmail.com> and other contributors

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.