Merge branch 'coverage'

Author: robodair

.travis.yml

@@ -10,41 +10,42 @@ python:
   - pypy
 
 matrix:
-  allow_failures:
-    - env: TOXENV=coverage
   include:
     - python: 3.6
-      env: TOXENV=coverage
+      env:
+        - TOXENV=coverage
+        - NO_DEPLOY=1
+    - python: 3.6
+      env:
+        - TOXENV=documentation
+        - NO_DEPLOY=1
 install:
     - pip install tox-travis
 script:
-  - tox --develop
-after_script:
-    - if [ $TOXENV == "coverage" ]; then
-      pip install --quiet coveralls;
-      coveralls;
-      fi
+  - tox
 deploy:
   - provider: releases
-    python: "3.6"
     skip_cleanup: true
     api_key:
       secure: 5/s0vQp3qmyE3lg38a1zTQM+HyUS0fnegvNHy3kh7cBacX60HakLmSA+NlUZX/epxHSb6eUJTg00ZCg89oOH5WWGPNkMRk3302MKWtNZXabR4JcOspGVnM9XBVpT+E3EDZumlC6p5YrX89QueelU0Isd/9AY1pbPxjAqMGgAPcuuKxWbxTYBkHBSIdm1xpU/P8PlFBtIJaeCgsZr72/AmuYXjb0gfVDoVaJa5hdj8gG47kWK3N4mwU+yh+A6BjUeuEUaUy2QYSK3KaB1AGw9w+6cZb0Odx6frrzdUx2sUP8yAxSIUgEjcygG9fy8ZUiwxJtyTzqIxx+1ssdp6oNVJzwWSaDVQE4l7GtipV+iEMr247LlChs+z7tNElYyZhZRj9rwqUwaNzlwIrIAf7zIuhZRH6G8b/8wka9RIMo7m+ivyVF2RiDjatqchE1BDClUrEdpWIzXRQywiPehDsmDOHGe2PaFdb8QFjdP2Q2onWg4Y7ou6LTPUFrqy0Oz0J8tvPdyliNsIW9crZjibJhx2ChbjMU8QxyzjlU17lhsHOeRR60NbZu0n5ZRkULMFycsRzwAE6CbyU8IktjQIRlXhjfAd0JSNqFvq8S17x51yjBU/sOmeJwfqMKQY2beuCaNhcJj5HksvKNmrc4zGPk6oiOJvbpm7KDQh0pCRKrewks=
     file_glob: true
     file: dist/*
     on:
+      python: "3.6"
       tags: true
       repo: robodair/pydocstring
+      condition: $NO_DEPLOY != 1
   - provider: releases
     skip_cleanup: true
-    python: "2.7"
     api_key:
       secure: 5/s0vQp3qmyE3lg38a1zTQM+HyUS0fnegvNHy3kh7cBacX60HakLmSA+NlUZX/epxHSb6eUJTg00ZCg89oOH5WWGPNkMRk3302MKWtNZXabR4JcOspGVnM9XBVpT+E3EDZumlC6p5YrX89QueelU0Isd/9AY1pbPxjAqMGgAPcuuKxWbxTYBkHBSIdm1xpU/P8PlFBtIJaeCgsZr72/AmuYXjb0gfVDoVaJa5hdj8gG47kWK3N4mwU+yh+A6BjUeuEUaUy2QYSK3KaB1AGw9w+6cZb0Odx6frrzdUx2sUP8yAxSIUgEjcygG9fy8ZUiwxJtyTzqIxx+1ssdp6oNVJzwWSaDVQE4l7GtipV+iEMr247LlChs+z7tNElYyZhZRj9rwqUwaNzlwIrIAf7zIuhZRH6G8b/8wka9RIMo7m+ivyVF2RiDjatqchE1BDClUrEdpWIzXRQywiPehDsmDOHGe2PaFdb8QFjdP2Q2onWg4Y7ou6LTPUFrqy0Oz0J8tvPdyliNsIW9crZjibJhx2ChbjMU8QxyzjlU17lhsHOeRR60NbZu0n5ZRkULMFycsRzwAE6CbyU8IktjQIRlXhjfAd0JSNqFvq8S17x51yjBU/sOmeJwfqMKQY2beuCaNhcJj5HksvKNmrc4zGPk6oiOJvbpm7KDQh0pCRKrewks=
     file_glob: true
     file: dist/*.whl
     on:
       tags: true
+      python: "2.7"
       repo: robodair/pydocstring
+      condition: $NO_DEPLOY != 1
   - provider: pypi
     distributions: "sdist bdist_wheel"
     skip_cleanup: true
@@ -53,3 +54,15 @@ deploy:
       secure: rBgaXD7HKbpiL/n21zZW/d+cKFwtbgM32xiAbM1DNz424BwLBBQK7urTMob4hdC+66PFAdZJU/Jr83M29P3t0tndn09ZeJ5rpnKlWSnpwzMCAFb/lxsWd0kuuchVx22rEnG8tsUtSXMMzWLegAdp14JO3POx4LtzX7kBbh+4Fv+F9ai5FO2K0fUFj0tv6W8s/GPJQxXJTMYYS09uVWI6ayHOvVNaLuITxfivQwy4ZO/UWlSCl92DozB0FA4ynZVle/8tI1pWspKMG/txwzSYfH6KMD/pDiOt61KKbenrD/6DIjjvN4OxVlV6w2XCCCAPLOZ6NooOTA0+Mkr+9tVd+WeALaBHopMqPbhXpiN230GkRWeonxLgMcjjr03O0+mXFr2CIqO4A6yV8Mxx+y3TJssR/wJsxnrdqby2usS6CHexaIR1Ui82b0XgOdaR6duxRDnhVHLWdxDTrkcAvmPANGObS5gDV3NwMaihLoSa+kIHxCqPtyEmo+MueXXue0o8q4RA0AOvNdgs7mQtIDSzrYRmMA23xVJoWPVInLLgPTHEw2EOUJyW6lC5qKkqmj1uH3r7XoAKAsXf9q1M6r/606If+Ic7J8C+IJiiaUQAEBiASkqLWsy76gLsKzpFWU3veufDnrSW2UEbNrZzN38L1YYogM4YMj9dTnz0nMZaW64=
     on:
       tags: true
+      python: "3.6"
+      condition: $NO_DEPLOY != 1
+  - provider: pypi
+    distributions: "bdist_wheel"
+    skip_cleanup: true
+    user: robodair
+    password:
+      secure: rBgaXD7HKbpiL/n21zZW/d+cKFwtbgM32xiAbM1DNz424BwLBBQK7urTMob4hdC+66PFAdZJU/Jr83M29P3t0tndn09ZeJ5rpnKlWSnpwzMCAFb/lxsWd0kuuchVx22rEnG8tsUtSXMMzWLegAdp14JO3POx4LtzX7kBbh+4Fv+F9ai5FO2K0fUFj0tv6W8s/GPJQxXJTMYYS09uVWI6ayHOvVNaLuITxfivQwy4ZO/UWlSCl92DozB0FA4ynZVle/8tI1pWspKMG/txwzSYfH6KMD/pDiOt61KKbenrD/6DIjjvN4OxVlV6w2XCCCAPLOZ6NooOTA0+Mkr+9tVd+WeALaBHopMqPbhXpiN230GkRWeonxLgMcjjr03O0+mXFr2CIqO4A6yV8Mxx+y3TJssR/wJsxnrdqby2usS6CHexaIR1Ui82b0XgOdaR6duxRDnhVHLWdxDTrkcAvmPANGObS5gDV3NwMaihLoSa+kIHxCqPtyEmo+MueXXue0o8q4RA0AOvNdgs7mQtIDSzrYRmMA23xVJoWPVInLLgPTHEw2EOUJyW6lC5qKkqmj1uH3r7XoAKAsXf9q1M6r/606If+Ic7J8C+IJiiaUQAEBiASkqLWsy76gLsKzpFWU3veufDnrSW2UEbNrZzN38L1YYogM4YMj9dTnz0nMZaW64=
+    on:
+      tags: true
+      python: "2.7"
+      condition: $NO_DEPLOY != 1

README.rst

@@ -6,9 +6,8 @@ pydocstring
 .. image:: https://travis-ci.org/robodair/pydocstring.svg?branch=master
     :target: https://travis-ci.org/robodair/pydocstring
 
-.. image:: https://coveralls.io/repos/github/robodair/pydocstring/badge.svg?branch=master
-    :target: https://coveralls.io/github/robodair/pydocstring?branch=master
-
+.. image:: https://codecov.io/gh/robodair/pydocstring/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/robodair/pydocstring
 
 .. image:: https://readthedocs.org/projects/pydocstring/badge/?version=latest
     :target: https://pydocstring.readthedocs.io/en/latest/?badge=latest
@@ -67,3 +66,8 @@ pydocstring is on `PyPI <https://pypi.org/project/pydocstring/>`_ and can be ins
 .. code-block:: bash
 
     pip install pydocstring
+
+Development
+===========
+
+Testing/Coverage is automanted with `tox <http://tox.readthedocs.io/>`_. Pull requests are welcome.

docs/conf.py

@@ -36,7 +36,7 @@
     'sphinx.ext.autosummary',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
-    'sphinxcontrib.napoleon'
+    'sphinx.ext.napoleon'
     ]
 
 # Enable automatic module docs generation
@@ -67,7 +67,7 @@
 import pydocstring
 version = pydocstring.__version__
 # The full version, including alpha/beta/rc tags.
-release = pydocstring.__version__ + pydocstring._version.build_identifier
+release = pydocstring.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pydocstring/__init__.py

@@ -3,7 +3,7 @@
 :py:func:`pydocstring.generate_docstring` with the source code and the position of your cursor.
 """
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 
 import parso
 from parso.python.tree import search_ancestor, BaseNode

setup.py

@@ -4,14 +4,14 @@
 from subprocess import CalledProcessError
 from setuptools import find_packages, setup
 
-VERSIONFILE="pydocstring/__init__.py"
-verstrline = open(VERSIONFILE, "rt").read()
-VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"
-mo = re.search(VSRE, verstrline, re.M)
-if mo:
-    version = mo.group(1)
+INIT_FILE="pydocstring/__init__.py"
+contents = open(INIT_FILE, "rt").read()
+VS_RE = r"^__version__ = ['\"]([^'\"]*)['\"]"
+version_attr = re.search(VS_RE, contents, re.M)
+if version_attr:
+    version = version_attr.group(1)
 else:
-    raise RuntimeError("Unable to find version string in %s." % (VERSIONFILE,))
+    raise RuntimeError("Unable to find version string in {0}.".format(INIT_FILE))
 
 classifiers=[
     'Development Status :: 4 - Beta',
@@ -50,19 +50,5 @@
     },
     install_requires=[
         'parso==0.1.1'
-    ],
-    extras_require = {
-        "dev": [
-            "nose==1.3.7",
-            "coverage==4.4.1",
-            "rednose==1.2.2",
-            "Sphinx==1.6.3",
-            "pylint==1.7.2",
-            "sphinx_rtd_theme==0.2.4",
-            "sphinxcontrib-napoleon==0.6.1",
-            "twine==1.9.1",
-            "tox==2.9.1",
-            "pytest==3.2.5"
-        ]
-    }
+    ]
 )

tox.ini

@@ -1,10 +1,9 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, py36, py37, coverage, docs
+envlist = py{26,27,33,34,35,36,37,py}, coverage, documentation
 
 [testenv]
 deps =
     pytest
-changedir=tests
 setenv =
 # https://github.com/tomchristie/django-rest-framework/issues/1957
 # tox corrupts __pycache__, solution from here:
@@ -13,21 +12,24 @@ commands =
     pytest {posargs}
 
 [testenv:coverage]
+basepython = python3.6
 deps =
-    coverage
     {[testenv]deps}
-
+    pytest-cov
+    codecov
+passenv = CI TRAVIS TRAVIS_*
+usedevelop=True
 commands =
-    coverage run --source pydocstring -m pytest
-    coverage report
-    coverage html
+    pytest --cov=pydocstring
+    codecov -X gcov
 
-[testenv:docs]
+[testenv:documentation]
+basepython = python3.6
 deps =
     sphinx
-    sphinxcontrib-napoleon
     sphinx_rtd_theme
-    {[testenv]deps}
-changedir=docs
+changedir = docs
+whitelist_externals=make
 commands =
     make html
+