Merge remote-tracking branch 'origin/master' into 4.3.x

samples/openapi3/client/petstore/python/.gitignore

@@ -45,7 +45,9 @@ coverage.xml
 *,cover
 .hypothesis/
 venv/
+.venv/
 .python-version
+.pytest_cache
 
 # Translations
 *.mo

samples/openapi3/client/petstore/python/dev-requirements.txt

@@ -0,0 +1,2 @@
+tox
+flake8

samples/openapi3/client/petstore/python/pom.xml

@@ -27,7 +27,7 @@
                 <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <id>nose-test</id>
+                        <id>test</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>exec</goal>

samples/openapi3/client/petstore/python/setup.cfg

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length=99

samples/openapi3/client/petstore/python/test-requirements.txt

@@ -1,5 +1,3 @@
-coverage>=4.0.3
-nose>=1.3.7
-pluggy>=0.3.1
-py>=1.4.31
-randomize>=0.13
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4

samples/openapi3/client/petstore/python/test_python2.sh

@@ -18,10 +18,9 @@ fi
 
 ### install dependencies
 pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT
-python setup.py develop
 
 ### run tests
-nosetests || exit 1
+tox -e py27 || exit 1
 
 ### static analysis of code
 flake8 --show-source petstore_api/

samples/openapi3/client/petstore/python/test_python2_and_3.sh

@@ -18,7 +18,6 @@ fi
 
 ### install dependencies
 pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT
-python setup.py develop
 
 ### run tests
 tox || exit 1

samples/openapi3/client/petstore/python/tox.ini

@@ -6,5 +6,4 @@ deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
 
 commands=
-   nosetests \
-      []
+   pytest --cov=petstore_api