Merge branch 'release/0.2'

Author: Sharoon Thomas

magento/__init__.py

@@ -3,19 +3,17 @@
     magento API
 
     :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010-2012 by Openlabs Technologies & Consulting (P) LTD
+    :copyright: (c) 2010-2013 by Openlabs Technologies & Consulting (P) LTD
     :license: AGPLv3, see LICENSE for more details
 '''
-__version__ = '0.1.5dev'
-
 __all__ = [
             'API',
             'Customer', 'CustomerGroup', 'CustomerAddress',
             'Country', 'Region',
             'Category', 'CategoryAttribute', 'Product', 'ProductAttribute',
             'ProductAttributeSet', 'ProductTypes', 'ProductImages',
             'ProductTierPrice', 'ProductLinks', 'ProductConfigurable',
-            'Inventory', 'Order', 'Shipment', 'Invoice',
+            'Inventory', 'Order', 'Shipment', 'Invoice', '__version__'
             ]
 
 from .api import API
@@ -26,3 +24,4 @@
 from .catalog import ProductTypes, ProductImages, ProductTierPrice
 from .catalog import ProductLinks, ProductConfigurable, Inventory
 from .sales import Order, Shipment, Invoice
+from .version import VERSION as __version__

magento/version.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+"""
+    version
+
+    Just the version here to avoid cyclic dependency when
+    installing the module
+
+    :copyright: © 2013 by Openlabs Technologies & Consulting (P) Limited
+    :license: BSD, see LICENSE for more details.
+"""
+VERSION = '0.2'

setup.py

@@ -4,49 +4,32 @@
     Magento API
 
     :copyright: (c) 2010 by Sharoon Thomas.
-    :copyright: (c) 2010 by Openlabs Technologies & Consulting (P) LTD
+    :copyright: (c) 2010-2013 by Openlabs Technologies & Consulting (P) LTD
     :license: AGPLv3, see LICENSE for more details
 
-    A simple to use python library to access the magento API and
-    covered by a complete test suite based on Nose tests. Also
-    includes a nose plugin to do the tests based on a config
-    file.
-
-    Example usage::
-    
-        from magento import Customer
-        url = 'http://yourmagento.com'
-        apiuser = 'apiusername'
-        apipass = 'password'
-        with Customer(url, apiuser, apipass) as customer_api:
-            customer_api.list()
-
-    The implemented methods and APIs are from the Core API of 
-    magento documented here: 
-    
-    http://www.magentocommerce.com/support/magento_core_api
-
 '''
+import os
 from setuptools import setup
-import magento
+
+execfile(os.path.join('magento', 'version.py'))
 
 setup(
     name = 'magento',
-    version=magento.__version__,
-    url='http://projects.openlabs.co.in/trac/openlabs_magento',
+    version=VERSION,
+    url='https://github.com/openlabs/magento/',
     license='GNU Affero General Public License v3',
     author='Sharoon Thomas, Openlabs Technologies',
     author_email='info@openlabs.co.in',
     description='Magento Core API Client',
-    long_description=__doc__,
+    long_description=open('README.rst').read(),
     packages=['magento'],
     zip_safe=False,
     platforms='any',
     install_requires=[
         'suds>=0.3.9',
     ],
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 6 - Mature',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3',