Merge branch 'support-python3.7-and-pytest-4.x' into jcfr-1.7.0-dev

* support-python3.7-and-pytest-4.x:
  dist: Remove support for building and distributing *.egg files
  pytest-verbose-parametrize: Fix integration tests to support pytest >= 4.1.0
  pytest-verbose-parametrize: Add support for revamped marker infrastructure
  pytest-webdriver: Fix RemovedInPytest4Warning using getfixturevalue
  Remove requirement for pytest<4.0.0
  pytest-virtualenv: Add virtualenv as install requirement. Fixes man-group#122
  Fix DeprecationWarning warnings using "logger.warning()" function
  wheels: Generate universal wheels installable with both python 2.x and 3.x
  pytest-server-fixture: Fix rethinkdb tests requiring rethinkdb < 2.4.0
  ci: Update circleci image to allow install of python 3.7
  ci: Skip Coveralls submission if COVERALLS_REPO_TOKEN env. var is empty
  ci: Test against Python 3.7

Author: jcfr

.circleci/config.yml

@@ -5,7 +5,8 @@ test-tmpl: &test-tmpl
     cat *.egg-info/top_level.txt  | xargs -Ipysrc coverage run -p --source=pysrc setup.py test -sv -ra || touch ../FAILED-$(basename $PWD)
 
 job-tmpl: &job-tmpl
-  machine: true
+  machine:
+    image: circleci/classic:201808-01
 
   working_directory: ~/src
 
@@ -118,7 +119,11 @@ job-tmpl: &job-tmpl
           coverage report
           pip install urllib3[secure]
           pip install coveralls
-          CIRCLE_BUILD_NUM=$CIRCLE_WORKFLOW_ID coveralls
+          if [[ "$COVERALLS_REPO_TOKEN" != "" ]]; then
+            CIRCLE_BUILD_NUM=$CIRCLE_WORKFLOW_ID coveralls
+          else
+            echo "Skipping Coveralls"
+          fi
 
     - store_test_results:
         path: junit
@@ -148,13 +153,23 @@ jobs:
     environment:
       PYTHON: "python3.6"
 
+  py37:
+    <<: *job-tmpl
+    environment:
+      PYTHON: "python3.7"
+
   coveralls:
     docker:
       - image: buildpack-deps:trusty
     steps:
       - run:
           name: Complete Coveralls
-          command: curl --fail https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$CIRCLE_WORKFLOW_ID&payload[status]=done"
+          command: |
+            if [[ "$COVERALLS_REPO_TOKEN" != "" ]]; then
+              curl --fail https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$CIRCLE_WORKFLOW_ID&payload[status]=done"
+            else
+              echo "Skipping Coveralls"
+            fi
 
 workflows:
   version: 2
@@ -164,9 +179,11 @@ workflows:
       - py34
       - py35
       - py36
+      - py37
       - coveralls:
           requires:
             - py27
             - py34
             - py35
             - py36
+            - py37

CHANGES.md

@@ -2,7 +2,8 @@
 ## Changelog
 
 ### 1.7.0
-  * pytest-server-fixtures: if host not defined, use localhost
+ * pytest-server-fixtures: if host not defined, use localhost
+ * circleci: Test against Python 3.7
 
 ### 1.6.2 (2019-02-21)
  * pytest-server-fixtures: suppress stacktrace if kill() is called

Makefile

@@ -8,15 +8,15 @@ EXTRA_DEPS = pypandoc       \
              pymongo        \
              psycopg2       \
              boto3          \
-             rethinkdb      \
+             "rethinkdb<2.4.0" \
              docker         \
              kubernetes
 
 COPY_FILES = VERSION CHANGES.md common_setup.py MANIFEST.in LICENSE
 UPLOAD_OPTS =
 
 # removed from PHONY:  circleci_sip circleci_pyqt
-.PHONY: extras copyfiles wheels eggs sdists install develop test upload clean
+.PHONY: extras copyfiles wheels sdists install develop test upload clean
 
 extras:
 	pip install $(EXTRA_DEPS)
@@ -28,9 +28,6 @@ wheels: copyfiles
 	pip install -U wheel
 	./foreach.sh --changed 'python setup.py bdist_wheel'
 
-eggs: copyfiles
-	./foreach.sh --changed 'python setup.py bdist_egg'
-
 sdists: copyfiles
 	./foreach.sh --changed 'python setup.py sdist'
 

pytest-devpi-server/README.md

@@ -13,8 +13,6 @@ Install using your favourite package manager:
 
 ```bash
     pip install pytest-devpi-server
-    #  or..
-    easy_install pytest-devpi-server
 ```
 
 Enable the fixture explicitly in your tests or conftest.py (not required when using setuptools entry points):

pytest-devpi-server/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
-	dist
+norecursedirs =
+	.git
+	*.egg
+	build
+	dist
+
+[bdist_wheel]
+universal = 1

pytest-devpi-server/setup.py

@@ -20,10 +20,11 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
 install_requires = ['pytest-server-fixtures',
-                    'pytest<4.0.0',
+                    'pytest',
                     'devpi-server>=3.0.1',
                     'devpi-client',
                     'six',

pytest-fixture-config/README.md

@@ -9,8 +9,6 @@ Install using your favourite package manager:
 
 ```bash
     pip install pytest-fixture-config
-    #  or..
-    easy_install pytest-fixture-config
 ```
 
 Enable the fixture explicitly in your tests or conftest.py (not required when using setuptools entry points):

pytest-fixture-config/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
-	dist
+norecursedirs =
+	.git
+	*.egg
+	build
+	dist
+
+[bdist_wheel]
+universal = 1

pytest-fixture-config/setup.py

@@ -19,9 +19,10 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
-install_requires = ['pytest<4.0.0']
+install_requires = ['pytest']
 
 tests_require = ['six',
                  ]

pytest-git/README.md

@@ -7,8 +7,6 @@ Creates an empty Git repository for testing that cleans up after itself on teard
 Install using your favourite package installer:
 ```bash
     pip install pytest-git
-    # or
-    easy_install pytest-git
 ```
 
 Enable the fixture explicitly in your tests or conftest.py (not required when using setuptools entry points):

pytest-git/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
-	dist
+norecursedirs =
+	.git
+	*.egg
+	build
+	dist
+
+[bdist_wheel]
+universal = 1

pytest-git/setup.py

@@ -19,9 +19,10 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
-install_requires = ['pytest<4.0.0',
+install_requires = ['pytest',
                     'pytest-shutil',
                     'gitpython',
                     ]

pytest-listener/README.md

@@ -8,8 +8,6 @@ Install using your favourite package manager:
 
 ```bash
     pip install pytest-listener
-    #  or..
-    easy_install pytest-listener
 ```
 
 Enable the fixture explicitly in your tests or conftest.py (not required when using setuptools entry points):

pytest-listener/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
-	dist
+norecursedirs =
+	.git
+	*.egg
+	build
+	dist
+
+[bdist_wheel]
+universal = 1

pytest-listener/setup.py

@@ -19,10 +19,11 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
 install_requires = ['six',
-                    'pytest<4.0.0',
+                    'pytest',
                     'pytest-server-fixtures'
                     ]
 

pytest-profiling/README.md

@@ -13,8 +13,6 @@ generated using [gprof2dot](http://code.google.com/p/jrfonseca/wiki/Gprof2Dot) a
 Install using your favourite package installer:
 ```bash
     pip install pytest-profiling
-    # or
-    easy_install pytest-profiling
 ```
 
 Enable the fixture explicitly in your tests or conftest.py (not required when using setuptools entry points):

pytest-profiling/setup.cfg

@@ -1,9 +1,12 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
+norecursedirs =
+	.git
+	*.egg
+	build
 	dist
 	tests/integration/profile/tests
+
+[bdist_wheel]
+universal = 1

pytest-profiling/setup.py

@@ -19,10 +19,11 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
 install_requires = ['six',
-                    'pytest<4.0.0',
+                    'pytest',
                     'gprof2dot',
                     ]
 

pytest-pyramid-server/README.md

@@ -10,8 +10,6 @@ Install using your favourite package manager:
 
 ```bash
     pip install pytest-pyramid-server
-    #  or..
-    easy_install pytest-pyramid-server
 ```
 
 Enable the fixture explicitly in your tests or conftest.py (not required when using setuptools entry points):

pytest-pyramid-server/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
-	dist
+norecursedirs =
+	.git
+	*.egg
+	build
+	dist
+
+[bdist_wheel]
+universal = 1

pytest-pyramid-server/setup.py

@@ -20,11 +20,12 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
 
 install_requires = ['pytest-server-fixtures',
-                    'pytest<4.0.0',
+                    'pytest',
                     'pyramid',
                     'waitress',
                     'six',

pytest-qt-app/README.md

@@ -7,8 +7,6 @@ Set up a Q Application for QT with an X-Window Virtual Framebuffer (Xvfb).
 Install using your favourite package installer:
 ```bash
     pip install pytest-qt-app
-    # or
-    easy_install pytest-qt-app
 ```
 
 Enable the fixture explicitly in your tests or conftest.py (not required when using setuptools entry points):

pytest-qt-app/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
-	dist
+norecursedirs =
+	.git
+	*.egg
+	build
+	dist
+
+[bdist_wheel]
+universal = 1

pytest-qt-app/setup.py

@@ -19,9 +19,10 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
-install_requires = ['pytest<4.0.0',
+install_requires = ['pytest',
                     'pytest-server-fixtures',
                     'pytest-shutil',
                     ]

pytest-server-fixtures/pytest_server_fixtures/rethink.py

@@ -178,5 +178,5 @@ def check_server_up(self):
                                           port=self.port, db='test')
             return True
         except rethinkdb.RqlDriverError as err:
-            log.warn(err)
+            log.warning(err)
         return False

pytest-server-fixtures/setup.cfg

@@ -1,8 +1,11 @@
 [tool:pytest]
 # This section sets configuration for all invocations of py.test,
 # both standalone cmdline and running via setup.py
-norecursedirs = 
-	.git 
-	*.egg 
-	build 
-	dist
+norecursedirs =
+	.git
+	*.egg
+	build
+	dist
+
+[bdist_wheel]
+universal = 1