Merge

.hgignore

@@ -1,2 +1,2 @@
-build
-dist
+build
+dist

README.txt

@@ -1,8 +1,8 @@
-jaraco.timing
-=============
-
-`Documentation <https://pythonhosted.org/jaraco.timing>`_
-
-``jaraco.timing`` provides some Python functions that are useful for timing how
-much real world time a piece of code takes to execute and limiting the
-frequency at which a function is called.
+jaraco.timing
+=============
+
+`Documentation <https://pythonhosted.org/jaraco.timing>`_
+
+``jaraco.timing`` provides some Python functions that are useful for timing how
+much real world time a piece of code takes to execute and limiting the
+frequency at which a function is called.

docs/conf.py

@@ -1,19 +1,19 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import setuptools_scm
-
-extensions = [
-    'sphinx.ext.autodoc',
-]
-
-# General information about the project.
-project = 'jaraco.timing'
-copyright = '2015 Jason R. Coombs'
-
-# The short X.Y version.
-version = setuptools_scm.get_version()
-# The full version, including alpha/beta/rc tags.
-release = version
-
-master_doc = 'index'
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import setuptools_scm
+
+extensions = [
+    'sphinx.ext.autodoc',
+]
+
+# General information about the project.
+project = 'jaraco.timing'
+copyright = '2015 Jason R. Coombs'
+
+# The short X.Y version.
+version = setuptools_scm.get_version(root='..')
+# The full version, including alpha/beta/rc tags.
+release = version
+
+master_doc = 'index'

docs/history.rst

@@ -1,8 +1,8 @@
-:tocdepth: 2
-
-.. _changes:
-
-History
-*******
-
-.. include:: ../CHANGES.txt
+:tocdepth: 2
+
+.. _changes:
+
+History
+*******
+
+.. include:: ../CHANGES.txt

docs/index.rst

@@ -1,22 +1,22 @@
-Welcome to jaraco.timing documentation!
-========================================
-
-.. toctree::
-   :maxdepth: 1
-
-   history
-
-
-.. automodule:: jaraco.timing
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
+Welcome to jaraco.timing documentation!
+========================================
+
+.. toctree::
+   :maxdepth: 1
+
+   history
+
+
+.. automodule:: jaraco.timing
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

pytest.ini

@@ -1,3 +1,3 @@
-[pytest]
-norecursedirs=*.egg .eggs dist build
-addopts=--doctest-modules
+[pytest]
+norecursedirs=*.egg .eggs dist build
+addopts=--doctest-modules

setup.cfg

@@ -1,3 +1,3 @@
-[aliases]
-release = sdist build_sphinx upload upload_docs
-test = pytest
+[aliases]
+release = sdist build_sphinx upload upload_docs
+test = pytest

setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Generated by jaraco.develop 2.16
+# Generated by jaraco.develop 2.20
 # https://pypi.python.org/pypi/jaraco.develop
 
 import io
@@ -25,9 +25,12 @@
 	long_description=long_description,
 	url="https://bitbucket.org/jaraco/jaraco.timing",
 	packages=setuptools.find_packages(),
+	include_package_data=True,
 	namespace_packages=['jaraco'],
 	install_requires=[
 	],
+	extras_require={
+	},
 	setup_requires=[
 		'setuptools_scm',
 	] + pytest_runner + sphinx,
@@ -42,6 +45,8 @@
 		"Programming Language :: Python :: 2.7",
 		"Programming Language :: Python :: 3",
 	],
+	entry_points={
+	},
 )
 if __name__ == '__main__':
 	setuptools.setup(**setup_params)