Merge pull request #116 from nicoddemus/release-1.0.0

Release 1.0.0

Author: nicoddemus

docs/changelog.rst

@@ -3,10 +3,20 @@
 Changelog
 =========
 
-1.0.0 (UNRELEASED)
+1.0.0 (2020-03-03)
 ------------------
 
-- Python 2.7 is no longer supported.
+**Important**
+
+- ``live_server`` is now ``session``-scoped by default. This can be changed by using the ``live-server_scope`` option in your ``pytest.ini`` (`#113`_). Thanks `@havok2063`_ for the initial patch and `@TWood67`_ for finishing it up.
+
+- pytest 5.2 or later is now required.
+
+- Python 2.7 and 3.4 are no longer supported.
+
+.. _@havok2063: https://github.com/havok2063
+.. _@TWood67: https://github.com/TWood67
+.. _#113: https://github.com/pytest-dev/pytest-flask/pull/113
 
 0.15.1 (2020-02-03)
 -------------------

docs/features.rst

@@ -188,15 +188,17 @@ in your project's ``pytest.ini`` file)::
 ``request_ctx`` - request context
 `````````````````````````````````
 
-``--live-server-scope`` - set the scope of the live server
+``live_server_scope`` - set the scope of the live server
 ``````````````````````````````````````````````````````````````````
 
-By default, the server will be scoped to `session`. In some cases, you may want
-it to be fixed to a different scope. You can use ``--live-server-scope`` (for example,
-in your project's ``pytest.ini`` file)::
+By default, the server will be scoped to ``session`` for performance reasons, however
+if your server has global state and you want better test isolation, you can use the
+``live_server_scope`` ini option to change the fixture scope:
+
+.. code-block:: ini
 
     [pytest]
-    addopts = --live-server-scope=function
+    live_server_scope = function
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

pytest_flask/fixtures.py

@@ -116,8 +116,8 @@ def _rewrite_server_name(server_name, new_port):
     return sep.join((server_name, new_port))
 
 
-def determine_scope(fixture_name, config):
-    return config.getoption('--live-server-scope', 'session')
+def determine_scope(*, fixture_name, config):
+    return config.getini('live_server_scope')
 
 
 @pytest.fixture(scope=determine_scope)

pytest_flask/plugin.py

@@ -168,8 +168,8 @@ def pytest_addoption(parser):
                     help='use a host where to listen (default localhost).')
     group.addoption('--live-server-port', action='store', default=0, type=int,
                     help='use a fixed port for the live_server fixture.')
-    group.addoption('--live-server-scope', action='store', default='session', type=str,
-                    help='modify the scope of the live_server fixture.')
+    parser.addini('live_server_scope', 'modify the scope of the live_server fixture.',
+                  default='session')
 
 
 def pytest_configure(config):

requirements/main.txt

@@ -1,3 +1,3 @@
-pytest>=3.6
+pytest>=5.2
 Flask
 Werkzeug>=0.7

setup.py

@@ -115,7 +115,7 @@ def read(*parts):
         return ''
 
 
-requirements = read('requirements', 'main.txt').splitlines() + ['pytest']
+requirements = read('requirements', 'main.txt').splitlines()
 tests_require = []
 
 extras_require = {
@@ -154,26 +154,24 @@ def read(*parts):
     keywords='pytest flask testing',
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
         'Environment :: Web Environment',
+        'Framework :: Pytest',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 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 :: Testing',
+        'Programming Language :: Python',
         'Topic :: Software Development :: Libraries :: Python Modules',
+        'Topic :: Software Development :: Testing',
     ],
+    python_requires=">=3.5",
 
-    # The following makes a plugin available to pytest
+    # The following makes the plugin available to pytest
     entry_points={
         'pytest11': [
             'flask = pytest_flask.plugin',

tests/test_live_server.py

@@ -42,7 +42,7 @@ def test_a(live_server):
                     'example.com:%d' % live_server.port
         ''')
 
-        result = appdir.runpytest('-v', '--live-server-scope=function')
+        result = appdir.runpytest('-v', '-o', 'live_server_scope=function')
         result.stdout.fnmatch_lines(['*PASSED*'])
         assert result.ret == 0