Merge branch 'release/1.7'

* release/1.7:
  bump version
  updates CHANGELOG
  udates CHANGELOG
  Add support for Python 3.8
  Remove branch restriction to allow test of feature branches
  Fix typos
  Fix and update links
  Drop the dot https://twitter.com/pytestdotorg/status/753767547866972160
  Add support for Python 3.6, 3.7 and PyPy3
  sudo no longer needed https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
  Drop support for EOL Python 2.6, 3.2-3.4
  Fix for Python 4

Author: saxix

.travis.yml

@@ -1,27 +1,20 @@
 language: python
-sudo: false
 
 python:
   - "2.7"
-  - "3.3"
-  - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
   - "pypy"
+  - "pypy3"
 
 install:
   - pip install .
   - pip install tox codecov
   - "TOX_ENV=${TRAVIS_PYTHON_VERSION/[0-9].[0-9]/py${TRAVIS_PYTHON_VERSION/.}}"
 
 
-branches:
-  only:
-    - master
-    - develop
-    - feature/travis
-
-
 before_success:
   - coverage erase
 

CHANGELOG

@@ -1,11 +1,16 @@
-1.6.0 (dev)
------------
+1.7.0
+-----
+* add support python 3.6,3.7,3.8
+* bug fixes
+
+1.6.0
+-----
 * removed pip dependency
 * drop support pytest<3.0
 
 1.5.1
 -----
-* drop suport python 2.6
+* drop support python 2.6
 
 1.5
 ---

README.rst

@@ -4,12 +4,12 @@ pytest-echo
 
 
 .. image:: https://badge.fury.io/py/pytest-echo.svg
-   :target: http://badge.fury.io/py/pytest-echo
+   :target: https://pypi.org/project/pytest-echo/
    :alt: PyPI package
 
 
 Print environment variables, package version and generic attributes,
-as they are at the begining of the test.
+as they are at the beginning of the test.
 
 Useful in the continuous integration to dump test
 configuration/environment and or to check if attributes are properly set
@@ -33,7 +33,7 @@ Dump environment variables
 
 .. code-block:: sh
 
-    $ py.test --echo-env=HOME
+    $ pytest --echo-env=HOME
     ============================= test session starts =========================
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
     Environment:
@@ -46,7 +46,7 @@ Dump package version
 
 .. code-block:: sh
 
-    $ py.test --echo-version=pytest_echo
+    $ pytest --echo-version=pytest_echo
     ============================= test session starts =========================
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
     Package version:
@@ -65,7 +65,7 @@ Dump attributes
 
 .. code-block:: sh
 
-    $ py.test --echo-attr=django.conf.settings.DEBUG
+    $ pytest --echo-attr=django.conf.settings.DEBUG
     ============================= test session starts =========================
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
     Inspections
@@ -102,7 +102,7 @@ Example of use in a django project:
 
 .. code-block:: sh
 
-    $ py.test
+    $ pytest
     ============================= test session starts =========================
     platform linux2 -- Python 2.7.4 -- py-1.4.22 -- pytest-2.6.0 -- /bin/python
     Environment:
@@ -130,7 +130,7 @@ as:
 
 .. code-block:: sh
 
-    $ py.test --echo-version=pytest-* --echo-env=VIRTUAL*
+    $ pytest --echo-version=pytest-* --echo-env=VIRTUAL*
 
 or
 
@@ -152,33 +152,33 @@ Links
 +--------------------+-----------------+---------------+----------------+
 | Development        |  |dev-build|    |  |dev-cov|    |  |dev-doc|     |
 +--------------------+-----------------+---------------+----------------+
-| Project home page: | https://github.com/saxix/pytest-echo             |
+| Project home page: | https://github.com/pytest-dev/pytest-echo        |
 +--------------------+--------------------------------------------------+
-| Issue tracker:     | https://github.com/saxix/pytest-echo/issues?sort |
+| Issue tracker:     | https://github.com/pytest-dev/pytest-echo/issues |
 +--------------------+--------------------------------------------------+
-| CI:                | https://travis-ci.org/saxix/pytest-echo          |
+| CI:                | https://travis-ci.org/pytest-dev/pytest-echo     |
 +--------------------+--------------------------------------------------+
-| Download:          | http://pypi.python.org/pypi/pytest-echo/         |
+| Download:          | https://pypi.org/project/pytest-echo/            |
 +--------------------+--------------------------------------------------+
-| Documentation:     | https://pytest-echo.readthedocs.org/en/latest/   |
+| Documentation:     | https://pytest-echo.readthedocs.io/en/latest/    |
 +--------------------+--------------------------------------------------+
 
 
-.. |master-build| image:: https://secure.travis-ci.org/saxix/pytest-echo.png?branch=master
-                    :target: http://travis-ci.org/saxix/pytest-echo/
+.. |master-build| image:: https://travis-ci.org/pytest-dev/pytest-echo.svg?branch=master
+                    :target: https://travis-ci.org/pytest-dev/pytest-echo
 
-.. |master-cov| image:: https://codecov.io/gh/saxix/pytest-echo/branch/master/graph/badge.svg
-                    :target: https://codecov.io/gh/saxix/pytest-echo
+.. |master-cov| image:: https://codecov.io/gh/pytest-dev/pytest-echo/branch/master/graph/badge.svg
+                    :target: https://codecov.io/gh/pytest-dev/pytest-echo
 
 .. |master-doc| image:: https://readthedocs.org/projects/pytest-echo/badge/?version=stable
-                    :target: http://pytest-echo.readthedocs.io/en/stable/
+                    :target: https://pytest-echo.readthedocs.io/en/stable/
 
-.. |dev-build| image:: https://secure.travis-ci.org/saxix/pytest-echo.png?branch=develop
-                  :target: http://travis-ci.org/saxix/pytest-echo/
+.. |dev-build| image:: https://travis-ci.org/pytest-dev/pytest-echo.svg?branch=develop
+                  :target: https://travis-ci.org/pytest-dev/pytest-echo
 
-.. |dev-cov| image:: https://codecov.io/gh/saxix/pytest-echo/branch/develop/graph/badge.svg
-                :target: https://codecov.io/gh/saxix/pytest-echo
+.. |dev-cov| image:: https://codecov.io/gh/pytest-dev/pytest-echo/branch/develop/graph/badge.svg
+                :target: https://codecov.io/gh/pytest-dev/pytest-echo
 
 .. |dev-doc| image:: https://readthedocs.org/projects/pytest-echo/badge/?version=latest
-                :target: http://pytest-echo.readthedocs.io/en/latest/
+                :target: https://pytest-echo.readthedocs.io/en/latest/
 

appveyor.yml

@@ -1,20 +1,23 @@
 # What Python version is installed where:
-# http://www.appveyor.com/docs/installed-software#python
+# https://www.appveyor.com/docs/build-environment/#python
 
 environment:
   matrix:
     - PYTHON: "C:\\Python27"
       TOX_ENV: "py27"
 
-    - PYTHON: "C:\\Python33"
-      TOX_ENV: "py33"
-
-    - PYTHON: "C:\\Python34"
-      TOX_ENV: "py34"
-
     - PYTHON: "C:\\Python35"
       TOX_ENV: "py35"
 
+    - PYTHON: "C:\\Python36"
+      TOX_ENV: "py36"
+
+    - PYTHON: "C:\\Python37"
+      TOX_ENV: "py37"
+
+    - PYTHON: "C:\\Python38"
+      TOX_ENV: "py38"
+
 
 init:
   - "%PYTHON%/python -V"

docs/conf.py

@@ -243,4 +243,4 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {'https://docs.python.org/': None}

pytest_echo.py

@@ -8,7 +8,7 @@
 import pkg_resources
 from pkg_resources import DistributionNotFound
 
-__version__ = '1.6.0'
+__version__ = '1.7.0'
 
 
 def get_installed_distributions():
@@ -66,7 +66,7 @@ def get_module_attribute(path):
     The `attribute` can be either a module attribute (ie. os.path.curdir)
     or a object attribute (ie. linecache.cache.__class__)
 
-    Warning: Be careful when use thi function as it load any module in the path
+    Warning: Be careful when use this function as it load any module in the path
     and this will execute any module's level code
 
     :param path: full path to the attribute

setup.py

@@ -9,14 +9,16 @@
     description='pytest plugin with mechanisms for echoing environment '
                 'variables, package version and generic attributes',
     long_description=open("README.rst").read(),
+    long_description_content_type='text/x-rst',
     version=__version__,
     author='Stefano Apostolico',
     author_email='[email protected]',
-    url='https://github.com/saxix/pytest-echo',
+    url='https://github.com/pytest-dev/pytest-echo',
     py_modules=['pytest_echo'],
     entry_points={'pytest11': ['echo = pytest_echo']},
     install_requires=['pytest>=2.2'],
     license="MIT License",
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -29,11 +31,11 @@
         'Topic :: Software Development :: Libraries',
         'Topic :: Utilities',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6'
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ])

test_echo.py

@@ -139,7 +139,7 @@ def test_echo_attr_module_object_attr(testdir):
     result = testdir.runpytest('--echo-attr=linecache.cache.__class__')
     if sys.version_info[0] == 2:
         match = "    linecache.cache.__class__: <type 'dict'>"
-    elif sys.version_info[0] == 3:
+    else:
         match = "    linecache.cache.__class__: <class 'dict'>"
 
     result.stdout.fnmatch_lines([match])

tox.ini

@@ -1,11 +1,11 @@
 [tox]
-envlist=py{27,35,36}-pytest{30,31,32,33,34,35}
+envlist=py{27,35,36,37,38}-pytest{30,31,32,33,34,35}
 
 [testenv]
 deps =
     coverage
-    py{27,33},pypy: django<2
-    py{34,35,36}: django>=2
+    py{27},pypy: django<2
+    py{35,36,37,38},pypy3: django>=2
     pytest30: pytest>=3.0,<3.1
     pytest31: pytest>=3.1,<3.2
     pytest32: pytest>=3.2,<3.3
@@ -15,7 +15,7 @@ deps =
 
 commands =
     pip install -e .
-    coverage run -m py.test -vv test_echo.py pytest_echo.py
+    coverage run -m pytest -vv test_echo.py pytest_echo.py
     coverage report
     coverage html