From 2be257bbfd750a10bdb7c864f9fa67c892e65194 Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Fri, 27 Mar 2015 09:42:17 -0700 Subject: [PATCH] Remove Swift handler (for now) Pyrax is deprecated and causing installation problems. Nuclear option. Change-Id: I2d27a541e6617e468862fd13c473ea0ce7bc774b --- etc/sample_rax_credentials.conf | 3 --- requirements.txt | 1 - setup.cfg | 2 +- shoebox/handlers.py | 29 ----------------------------- tox.ini | 1 - 5 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 etc/sample_rax_credentials.conf diff --git a/etc/sample_rax_credentials.conf b/etc/sample_rax_credentials.conf deleted file mode 100644 index f0d1564..0000000 --- a/etc/sample_rax_credentials.conf +++ /dev/null @@ -1,3 +0,0 @@ -[rackspace_cloud] -username = my_username -api_key = 01234567890abcdef diff --git a/requirements.txt b/requirements.txt index 52590dc..cc17005 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ notigen notification_utils -pyrax python-dateutil simport >= 0.0.dev0 diff --git a/setup.cfg b/setup.cfg index 41c8572..7474359 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = shoebox -version = 0.42 +version = 0.5 author = Dark Secret Software Inc. author-email = admin@darksecretsoftware.com summary = data archiving library diff --git a/shoebox/handlers.py b/shoebox/handlers.py index c285a73..477a51d 100644 --- a/shoebox/handlers.py +++ b/shoebox/handlers.py @@ -17,8 +17,6 @@ import os import os.path import shutil -import pyrax - import simport @@ -92,30 +90,3 @@ class DeleteFileCallback(ArchiveCallback): """Delete this file.""" os.remove(filename) return None - - -class SwiftUploadCallback(ArchiveCallback): - def __init__(self, **kwargs): - super(SwiftUploadCallback, self).__init__(**kwargs) - self.credentials_file = kwargs.get('credentials_file') - if not self.credentials_file: - raise MissingArgument("No credentials_file defined.") - - self.container = kwargs.get('container', 'shoebox') - self.auth_method = kwargs.get('auth_method', 'rackspace') - self.region = kwargs.get('region', 'DFW') - - pyrax.set_setting('identity_type', self.auth_method) - pyrax.set_setting("region", self.region) - pyrax.set_credential_file(self.credentials_file) - - self.cloud_files = pyrax.cloudfiles - - self.cloud_files.create_container(self.container) - - def on_close(self, filename): - checksum = pyrax.utils.get_checksum(filename) - # Blocking call ... - obj = self.cloud_files.upload_file(self.container, filename, - etag=checksum) - return filename diff --git a/tox.ini b/tox.ini index fca17c3..8e4c1a8 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,6 @@ deps = mock notigen notification_utils - pyrax python-dateutil simport