diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/conf.py | 11 | ||||
-rw-r--r-- | docs/dev/testing.rst | 2 | ||||
-rw-r--r-- | docs/modd.conf | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/docs/conf.py b/docs/conf.py index e1cbc497..d7793b79 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,7 +5,7 @@ import subprocess import sys sys.path.insert(0, os.path.abspath('..')) -import netlib.version +from mitmproxy import version extensions = [ @@ -47,9 +47,9 @@ author = u'The mitmproxy project' # built documents. # # The short X.Y version. -version = netlib.version.VERSION +version = version.VERSION # The full version, including alpha/beta/rc tags. -release = netlib.version.VERSION +release = version.VERSION # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -231,10 +231,7 @@ def linkcode_resolve(domain, info): _, line = inspect.getsourcelines(obj) except (TypeError, IOError): return None - if spath.rfind("netlib") > -1: - off = spath.rfind("netlib") - mpath = spath[off:] - elif spath.rfind("mitmproxy") > -1: + if spath.rfind("mitmproxy") > -1: off = spath.rfind("mitmproxy") mpath = spath[off:] else: diff --git a/docs/dev/testing.rst b/docs/dev/testing.rst index 315b9bc9..b86efce1 100644 --- a/docs/dev/testing.rst +++ b/docs/dev/testing.rst @@ -10,7 +10,7 @@ suitable extension to the test suite. Our tests are written for the `py.test`_ or nose_ test frameworks. At the point where you send your pull request, a command like this: ->>> py.test --cov mitmproxy --cov netlib +>>> py.test --cov mitmproxy Should give output something like this: diff --git a/docs/modd.conf b/docs/modd.conf index bc91238c..0e8f0dce 100644 --- a/docs/modd.conf +++ b/docs/modd.conf @@ -1,6 +1,6 @@ @build = ./_build -** !_build/** ../netlib/**/*.py ../mitmproxy/**/*.py { +** !_build/** ../mitmproxy/**/*.py { prep: sphinx-build -W -d @build/doctrees -b html . @build/html daemon: devd -m @build/html } |