Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
80 changes: 0 additions & 80 deletions contentcuration/contentcuration/utils/google_drive.py

This file was deleted.

31 changes: 0 additions & 31 deletions contentcuration/contentcuration/views/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
from contentcuration.utils.messages import get_messages
from contentcuration.views.base import current_user_for_context
from contentcuration.viewsets.channel import SettingsChannelSerializer
# from contentcuration.utils.google_drive import add_row_to_sheet

ISSUE_UPDATE_DATE = datetime(2018, 10, 29)

Expand Down Expand Up @@ -172,36 +171,6 @@ class StorageSettingsView(PostFormMixin, FormView):
form_class = StorageRequestForm

def form_valid(self, form):
# Send email with storage request
# name, email, storage requested, date of request, number of resources,
# average resource size, kind of content, licenses, potential public
# channels, audience, uploading for, message, time constraint
# values = [
# "{} {}".format(self.request.user.first_name, self.request.user.last_name),
# self.request.user.email,
# form.cleaned_data.get('storage'),
# datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
# form.cleaned_data.get('resource_count'),
# form.cleaned_data.get('resource_size'),
# form.cleaned_data.get('kind'),
# form.cleaned_data.get('creators'),
# form.cleaned_data.get('sample_link'),
# form.cleaned_data.get('license'),
# form.cleaned_data.get("public"),
# form.cleaned_data.get('audience'),
# form.cleaned_data.get('location'),
# form.cleaned_data.get('import_count'),
# form.cleaned_data.get('uploading_for'),
# form.cleaned_data.get('organization_type'),
# form.cleaned_data.get('message'),
# form.cleaned_data.get('time_constraint'),
# ]
# Write to storage request sheet
# In production: https://docs.google.com/spreadsheets/d/1uC1nsJPx_5g6pQT6ay0qciUVya0zUFJ8wIwbsTEh60Y/edit#gid=0
# Debug mode: https://docs.google.com/spreadsheets/d/16X6zcFK8FS5t5tFaGpnxbWnWTXP88h4ccpSpPbyLeA8/edit#gid=0
# Comment out for now as there is an authentication issue
# add_row_to_sheet(ccsettings.GOOGLE_STORAGE_REQUEST_SHEET, values)

channels = [c for c in form.cleaned_data["public"].split(", ") if c]
message = render_to_string(
"settings/storage_request_email.txt",
Expand Down
1 change: 0 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ ujson==4.0.2
# python-lsp-server
uritemplate==3.0.1
# via
# -c requirements.txt
# coreapi
# drf-yasg
urllib3==1.26.5
Expand Down
2 changes: 0 additions & 2 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ google-cloud-storage
django-s3-storage==0.13.4
requests>=2.20.0
google-cloud-core
gspread==3.6.0
google-api-python-client
django-db-readonly==0.7.0
oauth2client
django-mathfilters
Expand Down
25 changes: 0 additions & 25 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,26 +104,15 @@ future==0.18.2
# via -r requirements.in
google-api-core[grpc]==1.27.0
# via
# google-api-python-client
# google-cloud-core
# google-cloud-error-reporting
# google-cloud-kms
# google-cloud-logging
google-api-python-client==2.4.0
# via -r requirements.in
google-auth==1.30.0
# via
# google-api-core
# google-api-python-client
# google-auth-httplib2
# google-auth-oauthlib
# google-cloud-core
# google-cloud-storage
# gspread
google-auth-httplib2==0.1.0
# via google-api-python-client
google-auth-oauthlib==0.4.4
# via gspread
google-cloud-core==1.7.3
# via
# -r requirements.in
Expand Down Expand Up @@ -152,17 +141,13 @@ grpcio==1.37.1
# google-api-core
# googleapis-common-protos
# grpc-google-iam-v1
gspread==3.6.0
# via -r requirements.in
gunicorn==20.1.0
# via -r requirements.in
html5lib==1.1
# via -r requirements.in
httplib2==0.19.1
# via
# django-postmark
# google-api-python-client
# google-auth-httplib2
# oauth2client
idna==2.10
# via requests
Expand All @@ -184,8 +169,6 @@ newrelic==6.2.0.156
# via -r requirements.in
oauth2client==4.1.3
# via -r requirements.in
oauthlib==3.1.0
# via requests-oauthlib
packaging==20.9
# via google-api-core
pathlib==1.0.1
Expand Down Expand Up @@ -253,10 +236,6 @@ requests==2.25.1
# -r requirements.in
# google-api-core
# google-cloud-storage
# gspread
# requests-oauthlib
requests-oauthlib==1.3.0
# via google-auth-oauthlib
rsa==4.7.2
# via
# google-auth
Expand All @@ -269,9 +248,7 @@ six==1.16.0
# via
# click-repl
# google-api-core
# google-api-python-client
# google-auth
# google-auth-httplib2
# google-cloud-core
# google-resumable-media
# grpcio
Expand All @@ -284,8 +261,6 @@ six==1.16.0
# python-utils
sqlparse==0.4.1
# via django
uritemplate==3.0.1
# via google-api-python-client
urllib3==1.26.5
# via
# botocore
Expand Down