Skip to content

Commit

Permalink
Rebased against new 0.23.0rc2 (apache#127)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch authored and lyft-buildnotify-3 committed Feb 14, 2018
1 parent 57aa4e1 commit f68581f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 27 deletions.
6 changes: 1 addition & 5 deletions piptools_requirements3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@
#
appdirs==1.4.3
asn1crypto==0.23.0 # via cryptography
certifi==2017.7.27.1
cffi==1.9.1 # via cryptography
cryptography==1.9
enum34==1.1.6 # via cryptography
idna==2.5
idna==2.5 # via cryptography
ipaddress==1.0.18 # via cryptography
ndg-httpsclient==0.4.2
packaging==16.8
pyasn1==0.2.2
pycparser==2.17 # via cffi
pyopenssl==16.2.0
pyparsing==2.1.10 # via packaging
six==1.10.0

Expand Down
4 changes: 0 additions & 4 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,3 @@ s3werkzeugcache==0.1.1

# oauth
flask-oauthlib

# pydruid
pydruid==0.4.0

15 changes: 3 additions & 12 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,22 @@ boto3==1.4.4 # via s3werkzeugcache
boto==2.47.0
botocore==1.5.95 # via boto3, s3transfer
celery[sqs]==3.1.25
certifi==2017.7.27.1
certifi==2017.7.27.1 # via requests
cffi==1.9.1
chardet==3.0.4 # via requests
click==6.7 # via flask
configparser==3.5.0 # via flake8
configparser==3.5.0
coverage==4.4.1 # via pytest-cov
cryptography==1.9
docutils==0.14 # via botocore
enum34==1.1.6
enum==0.4.6 # via pydruid
flake8-tidy-imports==1.0.6
flake8==3.3.0
flask-cache==0.13.1 # via s3werkzeugcache
flask-oauthlib==0.9.4
flask-script==2.0.5
flask==0.12.2 # via flask-cache, flask-oauthlib, flask-script
funcsigs==1.0.2 # via mock
future==0.16.0 # via pyhive
futures==3.1.1 # via s3transfer
gevent==1.2.1
greenlet==0.4.12
gunicorn==19.7.1
Expand All @@ -54,25 +51,19 @@ lyft-stdlib==113.0.0
lyftsettings==0.1.0 # via lyft-requests
markupsafe==1.0 # via jinja2
mccabe==0.6.1 # via flake8
mock==2.0.0 # via pytest-mock
mysqlclient==1.3.12
ndg-httpsclient==0.4.2
oauthlib==2.0.6 # via flask-oauthlib, requests-oauthlib
packaging==16.8
pathtools==0.1.2 # via watchdog
pbr==3.1.1 # via mock
protobuf==3.2.0 # via lyft-requests
psutil==5.4.0 # via rainbow-saddle
psycopg2==2.7.3.2
py==1.4.34 # via pytest
pyasn1==0.2.2
pycodestyle==2.3.1 # via flake8
pycparser==2.17
pycurl==7.43.0
pydruid==0.4.0
pyflakes==1.5.0 # via flake8
pyhive==0.5.0
pyopenssl==16.2.0
pyparsing==2.1.10
pytest-cov==2.5.1
pytest-mock==1.1
Expand All @@ -83,7 +74,7 @@ pyyaml==3.12
rainbow-saddle==0.4.0
redis==2.10.6
requests-oauthlib==0.8.0 # via flask-oauthlib
requests==2.17.3 # via lyft-requests, pydruid, requests-oauthlib
requests==2.17.3 # via lyft-requests, requests-oauthlib
s3transfer==0.1.11 # via boto3
s3werkzeugcache==0.1.1
six==1.10.0
Expand Down
5 changes: 1 addition & 4 deletions requirements3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ boto3==1.4.4 # via s3werkzeugcache
boto==2.47.0
botocore==1.5.95 # via boto3, s3transfer
celery[sqs]==3.1.25
certifi==2017.7.27.1
certifi==2017.7.27.1 # via requests
cffi==1.9.1
chardet==3.0.4 # via requests
click==6.7 # via flask
Expand Down Expand Up @@ -52,21 +52,18 @@ lyftsettings==0.1.0 # via lyft-requests
markupsafe==1.0 # via jinja2
mccabe==0.6.1 # via flake8
mysqlclient==1.3.12
ndg-httpsclient==0.4.2
oauthlib==2.0.6 # via flask-oauthlib, requests-oauthlib
packaging==16.8
pathtools==0.1.2 # via watchdog
protobuf==3.2.0 # via lyft-requests
psutil==5.4.0 # via rainbow-saddle
psycopg2==2.7.3.2
py==1.4.34 # via pytest
pyasn1==0.2.2
pycodestyle==2.3.1 # via flake8
pycparser==2.17
pycurl==7.43.0
pyflakes==1.5.0 # via flake8
pyhive==0.5.0
pyopenssl==16.2.0
pyparsing==2.1.10
pytest-cov==2.5.1
pytest-mock==1.1
Expand Down
3 changes: 2 additions & 1 deletion superset_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,13 @@ def has_access(self, permission_name, view_name):
if tom_request_key:
if tom_request_key == SECRET_KEY:
logging.info('TOM request is authorized')
return True
return tom_request_key == SECRET_KEY
logging.warning('TOM request is unauthorized')

return super(LyftSecurityManager, self).has_access(permission_name,
view_name)


CUSTOM_SECURITY_MANAGER = LyftSecurityManager

SUPERSET_WEBSERVER_TIMEOUT = 120
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated 53 files
+1 −1 .gitignore
+1 −0 dev-reqs.txt
+6 −0 docs/installation.rst
+12 −12 setup.py
+ superset/assets/images/viz_thumbnails/rose.png
+12 −3 superset/assets/javascripts/chart/Chart.jsx
+32 −6 superset/assets/javascripts/chart/chartAction.js
+5 −0 superset/assets/javascripts/chart/chartReducer.js
+1 −0 superset/assets/javascripts/components/Loading.jsx
+1 −8 superset/assets/javascripts/components/StackTraceMessage.jsx
+36 −7 superset/assets/javascripts/dashboard/components/Dashboard.jsx
+2 −1 superset/assets/javascripts/dashboard/components/DashboardContainer.jsx
+2 −0 superset/assets/javascripts/dashboard/reducers.js
+8 −13 superset/assets/javascripts/explore/components/ExploreChartHeader.jsx
+22 −3 superset/assets/javascripts/explore/components/ExploreViewContainer.jsx
+2 −0 superset/assets/javascripts/explore/index.jsx
+2 −0 superset/assets/javascripts/explore/reducers/index.js
+14 −1 superset/assets/javascripts/explore/stores/controls.jsx
+19 −0 superset/assets/javascripts/explore/stores/visTypes.js
+114 −0 superset/assets/javascripts/logger.js
+0 −0 superset/assets/npm-debug.log.3344327073
+3 −3 superset/assets/package.json
+1 −0 superset/assets/spec/helpers/browser.js
+85 −0 superset/assets/spec/javascripts/chart/Chart_spec.jsx
+100 −7 superset/assets/spec/javascripts/dashboard/Dashboard_spec.jsx
+33 −6 superset/assets/spec/javascripts/dashboard/fixtures.jsx
+8 −3 superset/assets/spec/javascripts/dashboard/reducers_spec.js
+40 −0 superset/assets/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
+1 −0 superset/assets/stylesheets/superset.less
+0 −25 superset/assets/visualizations/deckgl/factory.jsx
+30 −1 superset/assets/visualizations/deckgl/layers/arc.jsx
+30 −3 superset/assets/visualizations/deckgl/layers/geojson.jsx
+30 −1 superset/assets/visualizations/deckgl/layers/grid.jsx
+30 −1 superset/assets/visualizations/deckgl/layers/hex.jsx
+8 −8 superset/assets/visualizations/deckgl/layers/index.js
+30 −1 superset/assets/visualizations/deckgl/layers/path.jsx
+30 −1 superset/assets/visualizations/deckgl/layers/polygon.jsx
+30 −1 superset/assets/visualizations/deckgl/layers/scatter.jsx
+30 −1 superset/assets/visualizations/deckgl/layers/screengrid.jsx
+10 −9 superset/assets/visualizations/main.js
+24 −0 superset/assets/visualizations/rose.css
+540 −0 superset/assets/visualizations/rose.js
+8 −3 superset/data/__init__.py
+58 −49 superset/db_engine_specs.py
+10 −8 superset/forms.py
+3 −2 superset/models/core.py
+19 −0 superset/security.py
+2 −2 superset/views/__init__.py
+62 −47 superset/views/core.py
+10 −49 superset/views/lyft.py
+156 −60 superset/viz.py
+15 −6 tests/core_tests.py
+40 −0 tests/viz_tests.py

0 comments on commit f68581f

Please sign in to comment.