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.

Sign up for GitHub

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

Remove cloud storage from Python package #2310

Merged
merged 6 commits into from
Aug 24, 2020
Merged

Remove cloud storage from Python package #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1fd475
Remove requirements.txt to keep just setup.py
Aug 21, 2020
8c2ea0e
Remove storage.py
Aug 21, 2020
17fc786
Remove cloud methods from storage.py
Aug 21, 2020
8b6436b
Remove old tests
Aug 21, 2020
f1752fb
Add tests for invalid paths
Aug 21, 2020
a665b19
Update licenses after removing dependencies
Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ repos:
hooks:
- id: black
args: ['python/', 'testing/', 'operator/helm', 'operator/seldon-operator/hack', '--exclude', '(testing/scripts/proto|seldon_core/proto/|.eggs)']
language_version: python3.6
1,878 changes: 200 additions & 1,678 deletions python/licenses/license.txt
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 6 additions & 22 deletions python/licenses/license_info.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,19 @@
"MarkupSafe","1.1.1","BSD License"
"PyYAML","5.3.1","MIT License"
"Werkzeug","1.0.1","BSD License"
"absl-py","0.9.0","Apache Software License"
"absl-py","0.10.0","Apache Software License"
"astunparse","1.6.3","BSD License"
"attrs","19.3.0","MIT License"
"azure-common","1.1.25","MIT License"
"azure-storage-blob","2.1.0","MIT License"
"azure-storage-common","2.1.0","MIT License"
"attrs","20.1.0","MIT License"
"cachetools","4.1.1","MIT License"
"certifi","2020.6.20","Mozilla Public License 2.0 (MPL 2.0)"
"cffi","1.14.1","MIT License"
"chardet","3.0.4","GNU Library or Lesser General Public License (LGPL)"
"click","7.1.2","BSD License"
"configparser","5.0.0","MIT License"
"cryptography","3.0","Apache Software License, BSD License"
"flatbuffers","1.12","Apache Software License"
"gast","0.3.3","BSD License"
"google-api-core","1.22.0","Apache Software License"
"google-auth","1.19.2","Apache Software License"
"google-auth","1.20.1","Apache Software License"
"google-auth-oauthlib","0.4.1","Apache Software License"
"google-cloud-core","1.3.0","Apache Software License"
"google-cloud-storage","1.30.0","Apache Software License"
"google-crc32c","0.1.0","Apache Software License"
"google-pasta","0.2.0","Apache Software License"
"google-resumable-media","0.7.0","Apache Software License"
"googleapis-common-protos","1.52.0","Apache Software License"
"grpcio","1.30.0","Apache Software License"
"grpcio","1.31.0","Apache Software License"
"grpcio-opentracing","1.1.4","Apache Software License"
"gunicorn","20.0.4","MIT License"
"h5py","2.10.0","BSD License"
Expand All @@ -41,25 +29,21 @@
"itsdangerous","1.1.0","BSD License"
"jaeger-client","4.3.0","Apache Software License"
"jsonschema","3.2.0","MIT License"
"minio","5.0.10","Apache Software License"
"numpy","1.19.1","BSD"
"oauthlib","3.1.0","BSD License"
"opentracing","2.3.0","Apache Software License"
"opt-einsum","3.3.0","MIT"
"prometheus-client","0.8.0","Apache Software License"
"protobuf","3.12.2","3-Clause BSD License"
"protobuf","3.13.0","3-Clause BSD License"
"pyasn1","0.4.8","BSD License"
"pyasn1-modules","0.2.8","BSD License"
"pycparser","2.20","BSD License"
"pyrsistent","0.16.0","MIT License"
"python-dateutil","2.8.1","BSD License, Apache Software License"
"pytz","2020.1","MIT License"
"redis","3.5.3","MIT License"
"requests","2.24.0","Apache Software License"
"requests-oauthlib","1.3.0","BSD License"
"rsa","4.6","Apache Software License"
"scipy","1.4.1","BSD License"
"seldon-core","1.2.2.dev0","Apache 2.0"
"seldon-core","1.2.3.dev0","Apache 2.0"
"six","1.15.0","MIT License"
"tensorboard","2.3.0","Apache Software License"
"tensorboard-plugin-wit","1.7.0","Apache 2.0"
Expand Down
16 changes: 0 additions & 16 deletions python/licenses/license_info.no_versions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,15 @@
"absl-py","Apache Software License"
"astunparse","BSD License"
"attrs","MIT License"
"azure-common","MIT License"
"azure-storage-blob","MIT License"
"azure-storage-common","MIT License"
"cachetools","MIT License"
"certifi","Mozilla Public License 2.0 (MPL 2.0)"
"cffi","MIT License"
"chardet","GNU Library or Lesser General Public License (LGPL)"
"click","BSD License"
"configparser","MIT License"
"cryptography","Apache Software License
"flatbuffers","Apache Software License"
"gast","BSD License"
"google-api-core","Apache Software License"
"google-auth","Apache Software License"
"google-auth-oauthlib","Apache Software License"
"google-cloud-core","Apache Software License"
"google-cloud-storage","Apache Software License"
"google-crc32c","Apache Software License"
"google-pasta","Apache Software License"
"google-resumable-media","Apache Software License"
"googleapis-common-protos","Apache Software License"
"grpcio","Apache Software License"
"grpcio-opentracing","Apache Software License"
"gunicorn","MIT License"
Expand All @@ -41,7 +29,6 @@
"itsdangerous","BSD License"
"jaeger-client","Apache Software License"
"jsonschema","MIT License"
"minio","Apache Software License"
"numpy","BSD"
"oauthlib","BSD License"
"opentracing","Apache Software License"
Expand All @@ -50,10 +37,7 @@
"protobuf","3-Clause BSD License"
"pyasn1","BSD License"
"pyasn1-modules","BSD License"
"pycparser","BSD License"
"pyrsistent","MIT License"
"python-dateutil","BSD License
"pytz","MIT License"
"redis","MIT License"
"requests","Apache Software License"
"requests-oauthlib","BSD License"
Expand Down
2 changes: 1 addition & 1 deletion python/requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r requirements.txt
# Test and linters
black==19.10b0
flake8==3.8.1
mypy<0.783
Expand Down
20 changes: 0 additions & 20 deletions python/requirements.txt
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions python/seldon_core/imports_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
# Variables to check if certain extra dependencies are included or
# not
_TF_PRESENT = False
_GCS_PRESENT = False
_AZURE_PRESENT = False

try:
# Fix for https://github.com/SeldonIO/seldon-core/issues/1076
Expand Down Expand Up @@ -39,46 +37,3 @@
"""
)
logger.info(notice)


try:
from google.cloud import storage # noqa: F401

_GCS_PRESENT = True
except ImportError:
_GCS_PRESENT = False
notice = textwrap.dedent(
"""
Support for Google Cloud Storage is not installed.
If you want to download resources from Google Cloud Storage
install `google-cloud-storage` or install `seldon_core` as

$ pip install seldon_core[gcs]

or

$ pip install seldon_core[all]
"""
)
logger.info(notice)

try:
from azure.storage.blob import BlockBlobService # noqa: F401

_AZURE_PRESENT = True
except ImportError:
_AZURE_PRESENT = False
notice = textwrap.dedent(
"""
Support for Azure Blob Storage is not installed.
If you want to download resources from Azure Blob Storage
install `azure-storage-blob` or install `seldon_core` as

$ pip install seldon_core[azure]

or

$ pip install seldon_core[all]
"""
)
logger.info(notice)
Loading