Merge remote-tracking branch 'upstream/master' into RazerM/master

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,10 @@
 Changelog
 =========
 
-Upcoming release
------------------
+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.

README.rst

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

docs/changelog.rst

@@ -4,7 +4,7 @@
 pytest-flask
 ============
 
-A set of `pytest <http://pytest.org>`_ fixtures to test Flask
+A set of `pytest <https://docs.pytest.org>`_ fixtures to test Flask
 extensions and applications.
 
 Features
@@ -117,16 +117,6 @@ def read(*parts):
         return ''
 
 
-def get_version():
-    version_file = read('pytest_flask', '__init__.py')
-    version_match = re.search(r'^__version__ = [\'"]([^\'"]*)[\'"]',
-                              version_file, re.MULTILINE)
-    if version_match:
-        return version_match.group(1)
-    raise RuntimeError('Unable to find version string.')
-
-
-version = get_version()
 requirements = read('requirements', 'main.txt').splitlines() + ['pytest']
 tests_require = []
 
@@ -139,16 +129,19 @@ def get_version():
 setup(
     name='pytest-flask',
 
-    # Versions should comply with PEP440. For a discussion on single-sourcing
-    # the version across setup.py and the project code, see
-    # http://packaging.python.org/en/latest/tutorial.html#version
-    version=version,
+    # Versions should comply with PEP440, and automatically obtained from tags
+    # thanks to setuptools_scm
+    use_scm_version={"write_to": "pytest_flask/_version.py"},
+    setup_requires=["setuptools-scm"],
 
     author='Vital Kudzelka',
     author_email='vital.kudzelka@gmail.com',
 
     url='https://github.com/vitalk/pytest-flask',
-    download_url='https://github.com/vitalk/pytest-flask/tarball/%s' % version,
+    project_urls={
+        "Source": "https://github.com/pytest-dev/pytest-flask",
+        "Tracker": "https://github.com/pytest-dev/pytest-flask/issues",
+    },
     description='A set of py.test fixtures to test Flask applications.',
     long_description=__doc__,
     license='MIT',
@@ -173,7 +166,10 @@ def get_version():
         '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',
         'Topic :: Software Development :: Testing',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],

pytest_flask/__init__.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import os
+
 import pytest
 try:
     from urllib2 import urlopen
@@ -9,6 +11,9 @@
 from flask import url_for
 
 
+pytestmark = pytest.mark.skipif(not hasattr(os, 'fork'), reason='needs fork')
+
+
 class TestLiveServer:
 
     def test_server_is_alive(self, live_server):