Merge 844f4bf into c922dc6

.travis.yml

@@ -4,7 +4,6 @@ python:
 - 3.8
 - 3.7
 - 3.6
-- 3.5
 - nightly
 - pypy3
 branches:

CHANGES.rst

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+unreleased
+-------
+
+- [feature] Drop support for python 2.7. From now on, only support python 3.6 and up
+
 1.2.1
 -------
 

requirements-test.txt

@@ -1,11 +1,9 @@
 # test runs requirements (versions we'll be testing against) - automatically updated by requires.io
-pytest==5.3.0; python_version>'3.4'
-pytest>=4.4.0; python_version<='3.4'
+pytest==5.3.0
 pytest-cov==2.7.1
 pytest-xdist==1.29.0
 coverage==4.5.4 # pytest-cov
-mirakuru==2.1.0; python_version>'3.5'
-mirakuru<2.1.0; python_version<='3.5'
+mirakuru==2.1.0
 port-for==0.4
 pymongo==3.9.0
 -e .[tests]

setup.cfg

@@ -1,6 +1,3 @@
-[wheel]
-universal = 1
-
 [pycodestyle]
 max-line-length = 80
 exclude = docs/*,build/*,venv/*

setup.py

@@ -65,6 +65,7 @@ def read(fname):
     author_email='thearoom@clearcode.cc',
     url='https://github.com/ClearcodeHQ/pytest-mongo',
     license='LGPL',
+    python_requires='>=3.6',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -74,14 +75,10 @@ def read(fname):
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     package_dir={'': 'src'},

src/pytest_mongo/factories.py

@@ -84,15 +84,11 @@ def mongo_proc_fixture(request):
         mongo_logsdir = logsdir or config['logsdir']
         mongo_logpath = os.path.join(
             mongo_logsdir,
-            'mongo.{port}.log'.format(
-                port=mongo_port
-            )
+            f'mongo.{mongo_port}.log'
         )
         mongo_db_path = os.path.join(
             tmpdir,
-            'mongo.{port}'.format(
-                port=mongo_port
-            )
+            f'mongo.{mongo_port}'
         )
         os.mkdir(mongo_db_path)
         request.addfinalizer(
@@ -101,15 +97,8 @@ def mongo_proc_fixture(request):
 
         mongo_executor = TCPExecutor(
             (
-                '{mongo_exec} --bind_ip {host} --port {port}'
-                ' --dbpath {dbpath} --logpath {logpath} {params}'
-            ).format(
-                mongo_exec=mongo_exec,
-                params=mongo_params,
-                host=mongo_host,
-                port=mongo_port,
-                dbpath=mongo_db_path,
-                logpath=mongo_logpath,
+                f'{mongo_exec} --bind_ip {mongo_host} --port {mongo_port}'
+                f' --dbpath {mongo_db_path} --logpath {mongo_logpath} {mongo_params}'
             ),
             host=mongo_host,
             port=mongo_port,

tests/conftest.py

@@ -4,9 +4,6 @@
 
 from pytest_mongo import factories
 
-if not sys.version_info >= (3, 5):
-    warnings.simplefilter("error", category=DeprecationWarning)
-
 # pylint:disable=invalid-name
 mongo_params = '--nojournal --noauth --noprealloc'