Merge branch 'release/3.2.0.2'

Author: Sharoon Thomas

attachment.py

@@ -118,11 +118,11 @@ def set_data(cls, attachments, name, value):
  ])
  key = Key(bucket)
  key.key = filename
- key.set_contents_from_string(value)
+ key.set_contents_from_string(value[:])
  else:
  key = Key(bucket)
  key.key = filename
- key.set_contents_from_string(value)
+ key.set_contents_from_string(value[:])
  cls.write(attachments, {
  'digest': digest,
  'collision': collision,

setup.py

@@ -1,17 +1,50 @@
 #! /usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
 import re
 import os
-from setuptools import setup
+import sys
+from setuptools import setup, Command
 import ConfigParser
+import unittest
 
 requires = ['boto']
 
 
 def read(fname):
  return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+
+class SQLiteTest(Command):
+ """
+ Run the tests on SQLite
+ """
+ description = "Run tests on SQLite"
+
+ user_options = []
+
+ def initialize_options(self):
+ pass
+
+ def finalize_options(self):
+ pass
+
+ def run(self):
+ if self.distribution.tests_require:
+ self.distribution.fetch_build_eggs(self.distribution.tests_require)
+
+ from trytond.config import CONFIG
+ CONFIG['db_type'] = 'sqlite'
+ os.environ['DB_NAME'] = ':memory:'
+
+ from tests import suite
+ test_result = unittest.TextTestRunner(verbosity=3).run(suite())
+
+ if test_result.wasSuccessful():
+ sys.exit(0)
+ sys.exit(-1)
+
+
 config = ConfigParser.ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
@@ -39,19 +72,20 @@ def read(fname):
 setup(
  name='trytond_attachment_s3',
  version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
+ description='Amazon S3 backend for Tryton Attachments',
  long_description=read('README.md'),
  author='Openlabs Technologies & Consulting (P) Limited',
  author_email=info.get('email', ''),
- url=info.get('website', ''),
+ url='https://github.com/openlabs/trytond-attachment-s3',
  package_dir={'trytond.modules.attachment_s3': '.'},
  packages=[
  'trytond.modules.attachment_s3',
  'trytond.modules.attachment_s3.tests',
  ],
  package_data={
- 'trytond.modules.attachment_s3': info.get('xml', []) +
- ['tryton.cfg', 'locale/*.po', '*.odt', 'icons/*.svg'],
+ 'trytond.modules.attachment_s3': info.get('xml', []) + [
+ 'tryton.cfg', 'locale/*.po', '*.odt', 'icons/*.svg'
+ ],
  },
  classifiers=[
  'Development Status :: 5 - Production/Stable',
@@ -73,4 +107,7 @@ def read(fname):
  """,
  test_suite='tests',
  test_loader='trytond.test_loader:Loader',
+ cmdclass={
+ 'test': SQLiteTest,
+ },
 )

tryton.cfg

@@ -1,4 +1,4 @@
 [tryton]
-version=3.0.1.1
+version=3.2.0.2
 depends:
  ir

utils/upload_attachments_to_s3.py

@@ -63,8 +63,9 @@ def upload(connection, bucket, data_path, database, new_db_name=None):
 
 if __name__ == '__main__':
  parser = OptionParser(
- usage="usage: %prog [options]" +
+ usage="usage: %prog [options]" + (
  " access_key secret_key bucket data_path db_name"
+ )
  )
  parser.add_option("-n", "--new-db-name", dest="new_db_name",
  help="New database name to prefix to the files", default=None)