Merge pull request #272 from MarketSquare/lucagiove-patch-1

Ready for GitHub Actions to build and test

Author: lucagiove

.github/workflows/pythonapp.yml

@@ -0,0 +1,50 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        #os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
+        python-version: [2.7, 3.6, 3.7, 3.8, pypy2, pypy3]
+        exclude:
+          - os: macos-latest
+            python-version: pypy2
+          - os: macos-latest
+            python-version: pypy3
+          - os: windows-latest
+            python-version: pypy2
+          - os: windows-latest
+            python-version: pypy3
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v1.2.0
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+    - name: Install dependencies
+      run: |
+        python -m pip install .[test]
+        pip install -r requirements.txt
+    - name: Lint with flake8
+      run: |
+        pip install flake8
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with Robot Framework
+      run: robot --exclude skip --pythonpath src --outputdir ./tests-report --consolecolors ansi tests
+    - name: Archive Robot Framework Tests Report
+      uses: actions/upload-artifact@v1
+      with:
+        name: rf-tests-report-${{ matrix.os }}-${{ matrix.python-version }}
+        path: ./tests-report

.travis.yml

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/bulkan/robotframework-requests.png?branch=master)](https://travis-ci.org/bulkan/robotframework-requests)
+![Python application](https://github.com/MarketSquare/robotframework-requests/workflows/Python%20application/badge.svg?branch=master)
 [![PyPi downloads](https://img.shields.io/pypi/dm/robotframework-requests.svg)](https://pypi.python.org/pypi/robotframework-requests)
 [![Latest Version](https://img.shields.io/pypi/v/robotframework-requests.svg)](https://pypi.python.org/pypi/robotframework-requests)
 

README.md

@@ -4,14 +4,14 @@
 
 try:
     from setuptools import setup
-except ImportError as error:
+except ImportError:
     from distutils.core import setup
 
+VERSION = None
 version_file = join(dirname(abspath(__file__)), 'src', 'RequestsLibrary', 'version.py')
-
 with open(version_file) as file:
-      code = compile(file.read(), version_file, 'exec')
-      exec(code)
+    code = compile(file.read(), version_file, 'exec')
+    exec(code)
 
 DESCRIPTION = """
 Robot Framework keyword library wrapper around the HTTP client library requests.
@@ -26,29 +26,28 @@
 Topic :: Software Development :: Testing
 """[1:-1]
 
-setup(name         = 'robotframework-requests',
-      version      = VERSION,
-      description  = 'Robot Framework keyword library wrapper around requests',
-      long_description = DESCRIPTION,
-      author       = 'Bulkan Savun Evcimen',
-      author_email = 'bulkan@gmail.com',
-      maintainer   = 'Luca Giovenzana',
-      maintainer_email = 'luca@giovenzana.org',
-      url          = 'http://github.com/bulkan/robotframework-requests',
-      license      = 'MIT',
-      keywords     = 'robotframework testing test automation http client requests',
-      platforms    = 'any',
-      classifiers  = CLASSIFIERS.splitlines(),
-      package_dir  = {'' : 'src'},
-      packages     = ['RequestsLibrary'],
+setup(name='robotframework-requests',
+      version=VERSION,
+      description='Robot Framework keyword library wrapper around requests',
+      long_description=DESCRIPTION,
+      author='Bulkan Savun Evcimen',
+      author_email='bulkan@gmail.com',
+      maintainer='Luca Giovenzana',
+      maintainer_email='luca@giovenzana.org',
+      url='http://github.com/bulkan/robotframework-requests',
+      license='MIT',
+      keywords='robotframework testing test automation http client requests',
+      platforms='any',
+      classifiers=CLASSIFIERS.splitlines(),
+      package_dir={'': 'src'},
+      packages=['RequestsLibrary'],
       install_requires=[
             'robotframework',
             'requests'
       ],
       extras_require={
             'test': ['flask']
-      },
-)
+      })
 
 """ Official release from master
 # make sure the setup version has been increased

setup.py

@@ -88,7 +88,7 @@ def _create_session(
         # Disable requests warnings, useful when you have large number of testcase
         # you will observe drastical changes in Robot log.html and output.xml files size
         if disable_warnings:
-            logging.basicConfig() # you need to initialize logging, otherwise you will not see anything from requests
+            logging.basicConfig()  # you need to initialize logging, otherwise you will not see anything from requests
             logging.getLogger().setLevel(logging.ERROR)
             requests_log = logging.getLogger("requests")
             requests_log.setLevel(logging.ERROR)
@@ -99,7 +99,7 @@ def _create_session(
         # verify can be a Boolean or a String
         if isinstance(verify, bool):
             s.verify = verify
-        elif isinstance(verify, str) or isinstance(verify, unicode):
+        elif utils.is_string_type(verify):
             if verify.lower() == 'true' or verify.lower() == 'false':
                 s.verify = self.builtin.convert_to_boolean(verify)
             else:
@@ -112,7 +112,7 @@ def _create_session(
         # cant pass these into the Session anymore
         self.timeout = float(timeout) if timeout is not None else None
         self.cookies = cookies
-        self.verify = verify if self.builtin.convert_to_boolean(verify) != True else None
+        self.verify = verify if self.builtin.convert_to_boolean(verify) is not True else None
 
         s.url = url
 

src/RequestsLibrary/RequestsKeywords.py

@@ -65,7 +65,7 @@ def json_pretty_print(content):
 def is_string_type(data):
     if PY3 and isinstance(data, str):
         return True
-    elif not PY3 and isinstance(data, unicode):
+    elif not PY3 and isinstance(data, unicode): # noqa
         return True
     return False
 

src/RequestsLibrary/utils.py

@@ -1 +1 @@
-VERSION = '0.6.5'
+VERSION = '0.6.6'

src/RequestsLibrary/version.py

@@ -1,8 +1,9 @@
 from requests.auth import HTTPBasicAuth
-    
-    # Example of a keyword that a test author would supply in order to use the
-    # `Create Custom Session` keyword.  Such a keyword can return any subclass
-    # of `AuthBase`.
-    # http://docs.python-requests.org/en/master/user/advanced/#custom-authentication
+# Example of a keyword that a test author would supply in order to use the
+# `Create Custom Session` keyword.  Such a keyword can return any subclass
+# of `AuthBase`.
+# http://docs.python-requests.org/en/master/user/advanced/#custom-authentication
+
+
 def get_custom_auth(user, pwd):
     return HTTPBasicAuth(user, pwd)

tests/customAuthenticator.py

@@ -11,7 +11,7 @@ Suite Teardown  Teardown Flask Http Server And Sessions
 
 *** Test Cases ***
 Readme Test
-    [Tags]  get
+    [Tags]  get    skip
     Create Session    github         http://api.github.com
     Create Session    google         http://www.google.com
     ${resp}=          Get Request    google               /