Skip to content

Commit

Permalink
Merge 75b7b8f into e69d067
Browse files Browse the repository at this point in the history
  • Loading branch information
sbreiff committed Jul 24, 2018
2 parents e69d067 + 75b7b8f commit 7f859cb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
1 change: 0 additions & 1 deletion requirements.txt
Expand Up @@ -11,7 +11,6 @@ python-magic==0.4.12
requests==2.11.0
xlrd==1.0.0
xlwt==1.1.2
awscli
dcicutils>=0.1.85

# Build tasks
Expand Down
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -17,7 +17,6 @@
'wheel>=0.24.0',
'xlrd',
'xlwt>=1.1.2',
'awscli',
'six',
'dcicutils>=0.2.1'
]
Expand Down
10 changes: 3 additions & 7 deletions wranglertools/import_data.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python3
# -*- coding: latin-1 -*-
"""See the epilog for detailed information."""
import json
import argparse
import os.path
import hashlib
Expand Down Expand Up @@ -1212,12 +1211,9 @@ def user_workflow_reader(datafile, sheet, connection):


def get_upload_creds(file_id, connection, file_info): # pragma: no cover
url = "%s%s/upload/" % (connection.server, file_id)
req = requests.post(url,
auth=connection.auth,
headers=connection.headers,
data=json.dumps({}))
return req.json()['@graph'][0]['upload_credentials']
url = "%s/upload/" % (file_id)
req = ff_utils.post_metadata({}, url, key=connection.key)
return req['@graph'][0]['upload_credentials']


def upload_file(metadata_post_response, path): # pragma: no cover
Expand Down

0 comments on commit 7f859cb

Please sign in to comment.