merged conflicts

krgupta · krgupta · commit c8947651325b · 2015-11-12T11:11:28.000-08:00
diff --git a/README.md b/README.md
@@ -1,12 +1,53 @@
-# sdk-python    [![Build Status](https://magnum.travis-ci.com/egodolja/sdk-python.svg?token=9z5hnp59uHpbBpKa445s&branch=master)](https://magnum.travis-ci.com/egodolja/sdk-python)
-Python SDK for the Authorize.Net API
+# Authorize.Net Python SDK 
 
-Installations
+[![Build Status](https://travis-ci.org/AuthorizeNet/sdk-python.png?branch=master)]
+(https://travis-ci.org/AuthorizeNet/sdk-python)
+
+`pip install AuthorizeNet`
+
+*** The Python SDK is still in limited Beta testing, please contact developer@authorize.net for more information ***
+
+## Prerequisites
+
+Requires 
+
+
+## Installation
+To install AuthorizeNet
+
+`pip install AuthorizeNet`
+
+
+## Registration & Configuration
+
+Get a sandbox account at https://developer.authorize.net/sandbox  
+Set your API credentials:  
+
+````python
+	merchantAuth = apicontractsv1.merchantAuthenticationType()
+	merchantAuth.name = 'YOUR_API_LOGIN_ID'
+	merchantAuth.transactionKey = 'YOUR_TRANSACTION_KEY'
+````
+
+For reporting tests, go to https://sandbox.authorize.net/ under Account tab->Transaction Details API and enable it.
+
+
+## Usage
+See our sample code repository at https://github.com/AuthorizeNet/sample-code-python
+
+For the simplest "Hello World" example, use paste this into a file called charge-credit-card.py and run:
+
+````python
+
+````
+
+## Building and Testing Source Code
+
+Requirements
 --------------------------------------
 - python 2.7
-- Editor of your choice (I used PyDev for Eclipse)
 - pyxb 1.2.4
- *install python before pyxb 
+
 
 Run the following to get pyxb and nosetests:
 - pip install pyxb
@@ -18,95 +59,4 @@ Testing
 - Tests available are: unit tests, mock tests, sample code
 - use nosetests to run all unittests 
 
-How to Use
---------------------------------------
-You need to set your credentials.
-Refer to template given in anet_python_sdk_properties_template.ini
-Either copy it to your root directory or make a new one similar to this. Whatever you opt, name file anet_python_sdk_properties.ini
-
-The following is a sample which shows how to create a transaction request 
-and execute it using the create transaction controller.
-
-from authorizenet import apicontractsv1
-from decimal import *
-from authorizenet.apicontrollers import CreateTransactionController
-
-class paymentTransaction(object):
-	
-	#set sandbox credentials and refid
-	api_login_id = "your api login id"
-	transaction_key = "your transaction key"
-	ref_id = "your ref id"
-	
-	#create merchant authentication using sandbox credentials
-	merchantAuthenticationOne = binding.merchantAuthenticationOne
-	merchantAuthenticationOne.name = api_login_id
-	merchantAuthenticationOne.transactionKey = transaction_key
-
-	#create credit card by filling out the following minimum requirements
-	creditCardOne = binding.creditCardType()
-	creditCardOne.cardNumber = "4111111111111111"
-	creditCardOne.expirationDate = "2020-12"
-	creditCardOne.cardCode = "999"
-	paymentOne = binding.paymentType()
-	paymentOne.creditCard = creditCardOne
-
-	#create order with details
-	orderOne = binding.orderType()
-	orderOne.invoiceNumber = "your invoice number"
-	orderOne.description = "product description"
-
-	#create customer; the following are minimum requirements
-	customerOne = binding.customerDataType()
-	customerOne.id = "numeric customerOne id"
-
-	#create billTo information
-	billToOne = binding.customerAddressType()
-	billToOne.firstName = "first name"
-	billToOne.lastName = "last name"
-	billToOne.company = "company name"
-	billToOne.address = "1 Main St"
-	billToOne.city = "city name"
-	billToOne.state = "state name"
-	billToOne.zip = "numeric zipcode"
-	billToOne.country = "country name"
-
-	#create transaction request 
-	transactionRequestOne = binding.transactionRequestType()
-	transactionRequestOne.transactionType = "authCaptureTransaction"
-	transactionRequestOne.amount = Decimal("6.25")
-	transactionRequestOne.paymentOne = paymentOne
-	transactionRequestOne.orderOne = orderOne
-	transactionRequestOne.customerOne = customerOne
-	transactionRequestOne.billToOne = billToOne
-
-	#build the createTransactionRequest 
-	createTransactionRequest = binding.createTransactionRequest()
-	createTransactionRequest.merchantAuthenticationOne = merchantAuthenticationOne
-	createTransactionRequest.refId = ref_id
-	createTransactionRequest.transactionRequestOne = transactionRequestOne
-
-	#create the controller which is used to build xml and execute it
-	createTransactionController = CreateTransactionController()
-	createRequest = CreateTransactionController.CreateTransactionController(createTransactionRequest)
-	CreateTransactionController.execute(createRequest, CreateTransactionController.getResponseClass())
-
-	#get the object from the response
-	response = CreateTransactionController.getResponseObject()
-
-	#check the response for details
-	if response:
-		if response.messages.resultCode == 'OK':
-			result = response.transactionResponse
-			if result.responseCode == '1':
-				print result.responseCode
-				print 'Successful Credit Card Transaction'
-				print ('authCode : %s' % result.authCode)
-				print ('transId: %s' % result.transId)
-			else:
-				print ('Failed transaction %s' % result.responseCode)
-		else:
-			print ('Failed transaction %s' % response.messages.resultCode)
-
-	print '---------------------------------------------'
 
diff --git a/anet_python_sdk_properties_template.ini b/anet_python_sdk_properties_template.ini
@@ -9,10 +9,7 @@ md5.hash.key : MD5_HASH_KEY
 logfilename : logFile.log
 
 #proxy setup
-http://internet.visa.com:80
-https://internet.visa.com:443
+#http://proxy.yourcompany.com:80
+#https://proxy.yourcompany.com:443
 
-#environments
-sandbox : https://apitest.authorize.net/xml/v1/request.api
-production : https://api.authorize.net/xml/v1/request.api
 
diff --git a/authorizenet/utility.py b/authorizenet/utility.py
@@ -5,6 +5,7 @@
 '''
 
 from ConfigParser import SafeConfigParser
+from ConfigParser import NoSectionError
 '''import ConfigParser'''
 import os
 '''import logging'''
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = DESCRIPTION.rst
diff --git a/setup.py b/setup.py
@@ -10,20 +10,16 @@
 
 here = path.abspath(path.dirname(__file__))
 
-# Get the long description from the relevant file
-with open(path.join(here, 'DESCRIPTION.rst'), encoding='utf-8') as f:
-    long_description = f.read()
 
 setup(
-    name='sdk-python',
+    name='authorizenet',
 
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.0.0',
+    version='1.0.2',
 
-    description='Authorize.Net Python project',
-    long_description=long_description,
+    description='Authorize.Net Python SDK',
 
     # The project's main homepage.
     url='https://github.com/AuthorizeNet/sdk-python',
@@ -66,7 +62,7 @@
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['pyxb', 'nose', 'nosetests', 'mock'],
+    install_requires=['pyxb', 'nose', 'mock'],
 	#install_requires=['nose'],
 	#install_requires=['nosetests'],
 	#install_requires=['mock'],
diff --git a/tests/apitestbase.py b/tests/apitestbase.py
@@ -24,8 +24,8 @@ def setUp(self):
         self.amount = str(round(random.random()*100, 2))
        
         self.merchantAuthentication = apicontractsv1.merchantAuthenticationType()       
-        self.merchantAuthentication.name = helper.getproperty('api.login.id')
-        self.merchantAuthentication.transactionKey = helper.getproperty('transaction.key')
+        self.merchantAuthentication.name = helper.getproperty('api_login_id')
+        self.merchantAuthentication.transactionKey = helper.getproperty('transaction_key')
         self.ref_id = 'Sample'
         
         self.dateOne = datetime.date(2020, 8, 30)
diff --git a/tests/testsmock.py b/tests/testsmock.py
@@ -2,6 +2,8 @@
 Created on Jul 1, 2015
 
 @author: egodolja
+
+'''
 '''
 import unittest
 
@@ -12,6 +14,7 @@
 from authorizenet.apicontrollers import *
 import test
 '''
+'''
 class ARBCancelSubscriptionControllerTest(apitestbase.ApiTestBase):
 
     def test_ARBCancelSubscriptionController(self):

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[metadata]`
	`2`	`+description-file = DESCRIPTION.rst`