Merge pull request #89 from AuthorizeNet/master

Sunny Raj Rathod · web-flow · commit 6a16e3a7a39e · 2017-11-14T21:01:09.000+05:30
Sync future with master
diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Operating system files
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,50 @@
 language: python
+
 sudo: false
 
+env:
+  - TEST_SUITE=samples
+  - TEST_SUITE=coverage
 python:
   - "2.7"
   - "3.4"
   - "3.5"
-  # - "pypy" Disabling pypy until travis moves to newer version, known issue with lxml crashing pypy
+  - "3.6"
+  - "3.7-dev"
+  - "pypy"
+  - "pypy3"
+  
+matrix:
+  fast_finish: true
+  allow_failures:
+    - python: "3.7-dev"
+      # 3.7-dev started crashing when building lxml although the neither the python version nor the lxml version seemed to change.
+      # Will have to investigate further.
+    - python: "pypy"
+    - python: "pypy3"
+      # pypy will just crash due to an incompatibility with lxml.
+      # Newer versions of pypy seem to crash also, so we probably have to fix with a newer version of lxml
+
+before_install:
+  # execute all of the commands which need to be executed 
+  # before installing dependencies
   
 install:
- - pip install unittest2
- - pip install nose
- - pip install pyxb
- - pip install lxml
- - pip install coveralls
+  # install all of the dependencies we need here
+  - pip install nose
+  - pip install pyxb==1.2.5
+    # can't change the pyxb version without changing the version in setup.py
+    # and regenerating the bindings in apicontractsv1.py
+  - pip install lxml
+  - if [[ "$TEST_SUITE" == "coverage" ]]; then pip install coveralls; fi
 
 before_script:
-  - git submodule update --remote --recursive
+  # execute all of the commands which need to be executed 
+  # before running actual tests
+  - if [[ "$TEST_SUITE" == "samples" ]]; then git submodule update --remote --recursive; fi
 
 script:
- - nosetests --with-coverage -cover-package=authorizenet
- - coveralls
- - python setup.py install
- - cd sample-code-python
- - python ./test-runner.py
+  # execute all of the tests or other commands to determine
+  # whether the build will pass or fail
+  - if [[ "$TEST_SUITE" == "coverage" ]]; then nosetests --with-coverage -cover-package=authorizenet; coveralls; fi
+  - if [[ "$TEST_SUITE" == "samples" ]]; then python setup.py install; cd sample-code-python; python ./test-runner.py; fi
diff --git a/DESCRIPTION.rst b/DESCRIPTION.rst
@@ -7,7 +7,7 @@ Python - demo version commit
 Installations
 --------------------------------------
 - python 2.7
-- pyxb 1.2.4
+- pyxb 1.2.5
  *install python before pyxb 
 
  
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -1,105 +1,89 @@
 # Authorize.Net Python SDK 
 
-[![Travis](https://img.shields.io/travis/AuthorizeNet/sdk-python/master.svg)](https://travis-ci.org/AuthorizeNet/sdk-python)
+[![Travis CI Status](https://travis-ci.org/AuthorizeNet/sdk-python.svg?branch=master)](https://travis-ci.org/AuthorizeNet/sdk-python)
 [![Coverage Status](https://coveralls.io/repos/github/AuthorizeNet/sdk-python/badge.svg?branch=master)](https://coveralls.io/github/AuthorizeNet/sdk-python?branch=master)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-python/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-python/?branch=master)
 [![PyPI](https://img.shields.io/pypi/v/authorizenet.svg)](https://badge.fury.io/py/authorizenet)
 
-`pip install authorizenet`
 
+## Requirements
+* For Python 2, Python 2.7 or greater
+* For Python 3, Python 3.4 or later
+* OpenSSL 1.0.2 or greater
+* An Authorize.Net account (see _Registration & Configuration_ section below)
 
-## Prerequisites
+_Note: Our goal is ensuring this SDK is compatible with Python 2.7+, 3.4+ and PyPy, but at the moment we're primarily testing against Python 2.7._
 
-We'll be ensuring this SDK is compatible with Python 2.6+, 3.2+ and PyPy but we're primarily testing against Python 2.7 so that's the current prerequisite.
+### TLS 1.2
+The Authorize.Net APIs only support connections using the TLS 1.2 security protocol. It's important to make sure you have new enough versions of all required components to support TLS 1.2. Additionally, it's very important to keep these components up to date going forward to mitigate the risk of any security flaws that may be discovered in your system or any libraries it uses.
 
 
 ## Installation
-To install AuthorizeNet
+To install the AuthorizeNet Python SDK:
 
 `pip install authorizenet`
 
 
 ## Registration & Configuration
+Use of this SDK and the Authorize.Net APIs requires having an account on our system. You can find these details in the Settings section.
+If you don't currently have a production Authorize.Net account and need a sandbox account for testing, you can easily sign up for one [here](https://developer.authorize.net/sandbox/).
+
+### Authentication
+To authenticate with the Authorize.Net API you will need to use your account's API Login ID and Transaction Key. If you don't have these values, you can obtain them from our Merchant Interface site. Access the Merchant Interface for production accounts at (https://account.authorize.net/) or sandbox accounts at (https://sandbox.authorize.net).
 
-Get a sandbox account at https://developer.authorize.net/sandbox  
-Set your API credentials:  
+Once you have your keys simply load them into the appropriate variables in your code, as per the below sample code dealing with the authentication part of the API request. 
 
-````python
+#### To set your API credentials for an API request:
+```python
 	merchantAuth = apicontractsv1.merchantAuthenticationType()
 	merchantAuth.name = 'YOUR_API_LOGIN_ID'
 	merchantAuth.transactionKey = 'YOUR_TRANSACTION_KEY'
-````
-
-
-## Usage
-See our sample code repository at https://github.com/AuthorizeNet/sample-code-python 
-
-For the simplest "Hello World" example, paste this into a file called charge-credit-card.py and run:
-
-````python
-from authorizenet import apicontractsv1
-from authorizenet.apicontrollers import *
-from decimal import *
+```
 
-merchantAuth = apicontractsv1.merchantAuthenticationType()
-merchantAuth.name = 'YOUR_LOGIN_ID'
-merchantAuth.transactionKey = 'YOUR_TRANSACTION_KEY'
+You should never include your Login ID and Transaction Key directly in a file that's in a publically accessible portion of your website. A better practice would be to define these in a constants file, and then reference those constants in the appropriate place in your code.
 
-creditCard = apicontractsv1.creditCardType()
-creditCard.cardNumber = "4111111111111111"
-creditCard.expirationDate = "2020-12"
+### Switching between the sandbox environment and the production environment
+Authorize.Net maintains a complete sandbox environment for testing and development purposes. This sandbox environment is an exact duplicate of our production environment with the transaction authorization and settlement process simulated. By default, this SDK is configured to communicate with the sandbox environment. To switch to the production environment, use the `setenvironment` method on the controller before executing.  For example:
+```python
+# For PRODUCTION use
+	createtransactioncontroller.setenvironment(constants.PRODUCTION)
+```
 
-payment = apicontractsv1.paymentType()
-payment.creditCard = creditCard
+API credentials are different for each environment, so be sure to switch to the appropriate credentials when switching environments.
 
-transactionrequest = apicontractsv1.transactionRequestType()
-transactionrequest.transactionType = "authCaptureTransaction"
-transactionrequest.amount = Decimal ('1.55')
-transactionrequest.payment = payment
 
+## SDK Usage Examples and Sample Code
+To get started using this SDK, it's highly recommended to download our sample code repository:
+* [Authorize.Net Python Sample Code Repository (on GitHub)](https://github.com/AuthorizeNet/sample-code-python)
 
-createtransactionrequest = apicontractsv1.createTransactionRequest()
-createtransactionrequest.merchantAuthentication = merchantAuth
-createtransactionrequest.refId = "MerchantID-0001"
+In that respository, we have comprehensive sample code for all common uses of our API:
 
-createtransactionrequest.transactionRequest = transactionrequest
-createtransactioncontroller = createTransactionController(createtransactionrequest)
-createtransactioncontroller.execute()
+Additionally, you can find details and examples of how our API is structured in our API Reference Guide:
+* [Developer Center API Reference](http://developer.authorize.net/api/reference/index.html)
 
-response = createtransactioncontroller.getresponse()
+The API Reference Guide provides examples of what information is needed for a particular request and how that information would be formatted. Using those examples, you can easily determine what methods would be necessary to include that information in a request using this SDK.
 
-if (response.messages.resultCode=="Ok"):
-	print "Transaction ID : %s" % response.transactionResponse.transId
-else:
-	print "response code: %s" % response.messages.resultCode
 
-````
-### Setting Production or Sandbox Environments  
-To set the environment use the setenvironment method on the controller before executing.  E.g. for the example above:
-````python
-# Defaults to constants.SANDBOX for sandbox testing
-createtransactioncontroller.setenvironment(constants.PRODUCTION)
-````
+## Building & Testing the SDK
 
-## Building and Testing Source Code
-
-Requirements
---------------------------------------
+### Requirements
 - python 2.7
-- pyxb 1.2.4
-
+- pyxb 1.2.5
 
 Run the following to get pyxb and nosetests:
-- pip install pyxb
-- pip install unittest2
+- pip install pyxb==1.2.5
 - pip install nose
 - pip install lxml
 
-Testing
---------------------------------------
+### Running the SDK Tests
 - Tests available are: unit tests, mock tests, sample code
-- use nosetests to run all unittests 
-`
->nosetests
-`
+- use nosetests to run all unittests
+
+`>nosetests`
+
+### Testing Guide
+For additional help in testing your own code, Authorize.Net maintains a [comprehensive testing guide](http://developer.authorize.net/hello_world/testing_guide/) that includes test credit card numbers to use and special triggers to generate certain responses from the sandbox environment.
+
 
+## License
+This repository is distributed under a proprietary license. See the provided [`LICENSE.txt`](/LICENSE.txt) file.
diff --git a/authorizenet/constants.py b/authorizenet/constants.py
@@ -16,7 +16,7 @@ class constants(object):
     PRODUCTION = 'https://api2.authorize.net/xml/v1/request.api'
 
     '''clientId'''
-    version = '1.0.13'
+    version = '1.0.14'
     clientId = 'sdk-python-' + version
 
     '''xml encoding'''
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
     # 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.13',
+    version='1.0.14',
 
     description='Authorize.Net Python SDK',
 
@@ -48,7 +48,8 @@
 
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 3.5'
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4'
     ],
 
     # What does your project relate to?
@@ -63,11 +64,11 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=['pyxb==1.2.5', 'nose', 'mock', 'lxml'],
-	#install_requires=['nose'],
-	#install_requires=['nosetests'],
-	#install_requires=['mock'],
-	#install_requires=['lxml'],
-	
+    #install_requires=['nose'],
+    #install_requires=['nosetests'],
+    #install_requires=['mock'],
+    #install_requires=['lxml'],
+
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
     # for example:
@@ -80,22 +81,22 @@
     },
     environment_variables={
         #api.login.id : xyz
-        #transaction.key : xyz 
+        #transaction.key : xyz
         #md5.hash.key : MD5_HASH_KEY
     },
 
     # If there are data files included in your packages that need to be
     # installed, specify them here.  If using Python 2.6 or less, then these
     # have to be included in MANIFEST.in as well.
-	#package_data={
+    #package_data={
     #    'sample': ['package_data.dat'],
-    #}, 
-	
+    #},
+
     # Although 'package_data' is the preferred approach, in some case you may
     # need to place data files outside of your packages. See:
     # http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files # noqa
     # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
-	# data_files=[('my_data', ['data/data_file'])],
+    # data_files=[('my_data', ['data/data_file'])],
 
     # To provide executable scripts, use entry points in preference to the
     # "scripts" keyword. Entry points provide cross-platform support and allow
@@ -104,5 +105,5 @@
     #    'console_scripts': [
     #        'sample=sample:main',
     #    ],
-    #}, 
+    #},
 )
