Merge remote-tracking branch 'upstream/master' into jadkik/fix_liveserver_process_termination

Author: nicoddemus

.gitignore

@@ -17,6 +17,9 @@ htmlcov/
 .tox/
 .coverage
 .coverage.*
-.cache
+.pytest_cache/
+.eggs/
 coverage.xml
 tests/junit.xml
+
+pytest_flask/_version.py

.travis.yml

@@ -1,34 +1,48 @@
 language: python
 
-branches:
-  except:
-    - gh-pages
-
-cache:
-  directories:
-    - "${HOME}/virtualenv"
-    - "${TRAVIS_BUILD_DIR}/.tox"
-
 python:
-  - 2.6
-  - 2.7
-  - 3.3
-  - 3.4
-  - 3.5
-  - 3.6
-  - pypy
+  - "3.6"
+
+stages:
+- test
+- name: deploy
+  if: repo = pytest-dev/pytest-flask AND tag IS present
+  
+jobs:
+  include:
+    - env: TOXENV=py27
+      python: '2.7'
+    - env: TOXENV=py34
+      python: '3.4'
+    - env: TOXENV=py35
+      python: '3.5'
+    - env: TOXENV=py36
+      python: '3.6'
+    - env: TOXENV=py37
+      python: '3.7'
+      sudo: required
+      dist: xenial
 
-matrix:
-  fast_finish: true
-  allow_failures:
-    - python: 3.6
-    - python: 3.5
+    - stage: deploy
+      python: '3.6'
+      env:
+      install: pip install -U setuptools setuptools_scm
+      script: skip
+      deploy:
+        provider: pypi
+        user: nicoddemus
+        distributions: sdist bdist_wheel
+        skip_upload_docs: true
+        password:
+          secure: lSaCqdifJoDS7qjpAnGgfrvuACEEBBQYDsjtkNlkktIhrZNJi0OjNWNuHN8uDpQSULiOdiQv/bOCAk288Pao341nHznMP3Cu9o+Zgi96dESAwTHx7w+01uzj+nzuRieeYL+Ye9VK0W3A7yu8tTG2GAhuqKCv0bDV7fUKAfySSI+SKTudLt4DHAYLd02tpbmPoHcHRqUSKTtkJKYUaYGM9QGk8p4+2ap006nqiykhiplnAWNLu+xzby7TaFYpA3Yy4x6XWMcdOoTaaBzQHZaGVayT1zR1BfmcOovlIb8sOUQVr6PV/dxC29VTRuyY85S2Rdyw/2Y4viTO5c1omEU/pVzy4RNi4RWboh58WA0kjrwOmb/nLW8AcXNJG9H828dqy8KKdbblTU5guz1oO1Tb2ICLT2z4hQOcZoDkCg3jf54Ee4BYvLOvMH/kNOjNqLA7wjBUzvyWk5OPOIPZ0rozmRwU89VS2kxIhbvtAq0BtmLnIYY3nT5BIrt18FomiINxlgZj6jz2uWGaOPAhcghdjydbGdYs5g2JcUc1B3jvXSyjB+o1l/EJ9OUwCQWIc32XWvOtx/a7pcyrejbKBqQqi5nKF1bvYDM+8VSLEeLTIX1Ie8hModxWp8WPIk+dHBdy8Kb91c4ssOvEkfwHK7cYBdbcn6O0yhiLOxuOO/3Cb3c=
+        on:
+          tags: true
+          repo: pytest-dev/pytest-flask
 
 install:
-  - pip install tox
-  - pip install tox-travis
+  - pip install -U pip
+  - pip install -U tox setuptools
 
 script:
   - tox
-  - "find ${TRAVIS_BUILD_DIR}/.tox -name log -o -name __pycache__ -type d | xargs -I {} rm -rf {}"
 

HOWTORELEASE.rst

@@ -0,0 +1,7 @@
+Here are the steps on how to make a new release.
+
+1. Create a ``release-VERSION`` branch from ``upstream/master``.
+2. Update ``docs/changelog.rst``.
+3. Push a branch with the changes.
+4. Once all builds pass, push a tag to ``upstream``.
+5. Merge the PR.

MANIFEST.in

@@ -1,7 +1,7 @@
 pytest-flask
 ============
 
-|PyPI version| |PyPI downloads| |Documentation status|
+|PyPI version| |conda-forge version| |Python versions| |Documentation status|
 
 An extension of `pytest <http://pytest.org/>`__ test runner which
 provides a set of useful tools to simplify testing and development
@@ -14,7 +14,9 @@ the `PyPI <https://pypi.python.org/pypi/pytest-flask>`__ overview page or
 How to start?
 -------------
 
-Define your application fixture in ``conftest.py``::
+Define your application fixture in ``conftest.py``:
+
+.. code-block:: python
 
     from myapp import create_app
 
@@ -38,8 +40,12 @@ suggestion.
    :target: https://pypi.python.org/pypi/pytest-flask
    :alt: PyPi version
 
-.. |PyPI downloads| image:: https://img.shields.io/pypi/dm/pytest-flask.svg
-   :target: https://pypi.python.org/pypi/pytest-flask
+.. |conda-forge version| image:: https://img.shields.io/conda/vn/conda-forge/pytest-flask.svg
+   :target: https://anaconda.org/conda-forge/pytest-flask
+   :alt: conda-forge version
+
+.. |Python versions| image:: https://img.shields.io/pypi/pyversions/pytest-flask.svg
+   :target: https://pypi.org/project/pytest-flask
    :alt: PyPi downloads
 
 .. |Documentation status| image:: https://readthedocs.org/projects/pytest-flask/badge/?version=latest

Makefile

@@ -3,8 +3,24 @@
 Changelog
 =========
 
-Upcoming release
------------------
+
+Next Release
+------------
+
+- Add new ``--live-server-port`` option to select the port the live server will use (`#82`_).
+  Thanks `@RazerM`_ for the PR.
+
+.. _@RazerM: https://github.com/RazerM
+.. _#82: https://github.com/pytest-dev/pytest-flask/pull/82
+
+
+0.11.0 (compared to 0.10.0)
+---------------------------
+
+- Implement deployment using Travis, following in line with many other pytest plugins.
+
+- Allow live server to handle concurrent requests (`#56`_), thanks to
+  `@mattwbarry`_ for the PR.
 
 - Fix broken link to pytest documentation (`#50`_), thanks to
   `@jineshpaloor`_ for the PR.
@@ -21,8 +37,10 @@ Upcoming release
 .. _#43: https://github.com/vitalk/pytest-flask/issues/43
 .. _#48: https://github.com/pytest-dev/pytest-flask/pull/48
 .. _#50: https://github.com/pytest-dev/pytest-flask/pull/50
+.. _#56: https://github.com/pytest-dev/pytest-flask/pull/56
 .. _@danstender: https://github.com/danstender
 .. _@jineshpaloor: https://github.com/jineshpaloor
+.. _@mattwbarry: https://github.com/mattwbarry
 .. _@steenzout: https://github.com/steenzout
 
 

README.rst

@@ -157,7 +157,7 @@ example, in your project’s ``pytest.ini`` file)::
 
 .. note::
 
-    Your **should manually start** live server after you finish your application
+    You **should manually start** live server after you finish your application
     configuration and define all required routes:
 
     .. code:: python
@@ -174,6 +174,17 @@ example, in your project’s ``pytest.ini`` file)::
             assert b'got it' in res.read()
 
 
+``--live-server-port`` - use a fixed port
+`````````````````````````````````````````
+
+By default the server uses a random port. In some cases it is desirable to run
+the server with a fixed port. You can use ``--live-server-port`` (for example,
+in your project's ``pytest.ini`` file)::
+
+    [pytest]
+    addopts = --live-server-port=5000
+
+
 ``request_ctx`` - request context
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/changelog.rst

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "0.10.0"
+from ._version import version as __version__

docs/features.rst

@@ -9,8 +9,9 @@
 import logging
 
 try:
-    from urllib2 import urlopen
+    from urllib2 import URLError, urlopen
 except ImportError:
+    from urllib.error import URLError
     from urllib.request import urlopen
 
 from flask import _request_ctx_stack
@@ -37,7 +38,7 @@ def login(self, email, password):
                 return self.client.post(url_for('login'), data=credentials)
 
             def test_login(self):
-                assert self.login('vital@example.com', 'pass').status_code == 200
+                assert self.login('foo@example.com', 'pass').status_code == 200
 
     """
     if request.cls is not None:
@@ -61,7 +62,7 @@ def __init__(self, app, port, clean_stop=False):
     def start(self):
         """Start application in a separate process."""
         def worker(app, port):
-            app.run(port=port, use_reloader=False)
+            app.run(port=port, use_reloader=False, threaded=True)
         self._process = multiprocessing.Process(
             target=worker,
             args=(self.app, self.port)
@@ -76,7 +77,7 @@ def worker(app, port):
             try:
                 urlopen(self.url())
                 timeout = 0
-            except:
+            except URLError:
                 timeout -= 1
 
     def url(self, url=''):
@@ -114,10 +115,10 @@ def _rewrite_server_name(server_name, new_port):
 
 
 @pytest.fixture(scope='function')
-def live_server(request, app, monkeypatch):
+def live_server(request, app, monkeypatch, pytestconfig):
     """Run application in a separate process.
 
-    When the ``live_server`` fixture is applyed, the ``url_for`` function
+    When the ``live_server`` fixture is applied, the ``url_for`` function
     works as expected::
 
         def test_server_is_up_and_running(live_server):
@@ -128,11 +129,14 @@ def test_server_is_up_and_running(live_server):
             assert res.code == 200
 
     """
-    # Bind to an open port
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    s.bind(('', 0))
-    port = s.getsockname()[1]
-    s.close()
+    port = pytestconfig.getvalue('live_server_port')
+
+    if port == 0:
+        # Bind to an open port
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        s.bind(('', 0))
+        port = s.getsockname()[1]
+        s.close()
 
     # Explicitly set application ``SERVER_NAME`` for test suite
     # and restore original value on test teardown.