Skip to content

Commit 23d95cd

Browse files
committed
Updated project name in docs
Updated from references to pep8 -> pycodestyle, this fixes the sphinx build errors caught by readthedocs.
1 parent 99139d9 commit 23d95cd

File tree

8 files changed

+69
-74
lines changed

8 files changed

+69
-74
lines changed

docs/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ qthelp:
7777
@echo
7878
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
7979
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
80-
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pep8.qhcp"
80+
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pycodestyle.qhcp"
8181
@echo "To view the help file:"
82-
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pep8.qhc"
82+
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pycodestyle.qhc"
8383

8484
devhelp:
8585
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
8686
@echo
8787
@echo "Build finished."
8888
@echo "To view the help file:"
89-
@echo "# mkdir -p $$HOME/.local/share/devhelp/pep8"
90-
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pep8"
89+
@echo "# mkdir -p $$HOME/.local/share/devhelp/pycodestyle"
90+
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pycodestyle"
9191
@echo "# devhelp"
9292

9393
epub:

docs/advanced.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. currentmodule:: pep8
1+
.. currentmodule:: pycodestyle
22

33
==============
44
Advanced usage
@@ -8,7 +8,7 @@ Advanced usage
88
Automated tests
99
---------------
1010

11-
You can also execute ``pep8`` tests from Python code. For example, this
11+
You can also execute ``pycodestyle`` tests from Python code. For example, this
1212
can be highly useful for automated testing of coding style conformance
1313
in your project::
1414

@@ -18,10 +18,10 @@ in your project::
1818

1919
class TestCodeFormat(unittest.TestCase):
2020

21-
def test_pep8_conformance(self):
22-
"""Test that we conform to PEP8."""
23-
pep8style = pycodestyle.StyleGuide(quiet=True)
24-
result = pep8style.check_files(['file1.py', 'file2.py'])
21+
def test_conformance(self):
22+
"""Test that we conform to PEP-8."""
23+
style = pycodestyle.StyleGuide(quiet=True)
24+
result = style.check_files(['file1.py', 'file2.py'])
2525
self.assertEqual(result.total_errors, 0,
2626
"Found code style errors (and warnings).")
2727

@@ -41,18 +41,18 @@ There's also a shortcut for checking a single file::
4141
Configuring tests
4242
-----------------
4343

44-
You can configure automated ``pep8`` tests in a variety of ways.
44+
You can configure automated ``pycodestyle`` tests in a variety of ways.
4545

46-
For example, you can pass in a path to a configuration file that ``pep8``
46+
For example, you can pass in a path to a configuration file that ``pycodestyle``
4747
should use::
4848

4949
import pycodestyle
5050

51-
pep8style = pycodestyle.StyleGuide(config_file='/path/to/tox.ini')
51+
style = pycodestyle.StyleGuide(config_file='/path/to/tox.ini')
5252

5353
You can also set specific options explicitly::
5454

55-
pep8style = pycodestyle.StyleGuide(ignore=['E501'])
55+
style = pycodestyle.StyleGuide(ignore=['E501'])
5656

5757

5858
Skip file header
@@ -81,8 +81,8 @@ through a custom wrapper for the PEP 8 library::
8181
filename, lines=lines, expected=expected, line_offset=line_offset)
8282

8383
if __name__ == '__main__':
84-
pep8style = PEP8(parse_argv=True, config_file=True)
85-
report = pep8style.check_files()
84+
style = PEP8(parse_argv=True, config_file=True)
85+
report = style.check_files()
8686
if report.total_errors:
8787
raise SystemExit(1)
8888

@@ -91,4 +91,4 @@ and 20 lines at the end. If there's no line to skip at the end, it could be
9191
changed with ``LINES_SLICE = slice(14, None)`` for example.
9292

9393
You can save it in a file and use it with the same options as the
94-
original ``pep8``.
94+
original ``pycodestyle``.

docs/api.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
========
2-
pep8 API
3-
========
1+
===============
2+
pycodestyle API
3+
===============
44

5-
.. module:: pep8
5+
.. module:: pycodestyle
66

77
The library provides classes which are usable by third party tools.
88

@@ -84,5 +84,5 @@ Utilities
8484
.. autofunction:: stdin_get_value()
8585
.. autofunction:: parse_udiff(diff, patterns=None, parent='.')
8686
.. autofunction:: filename_match(filename, patterns, default=True)
87-
.. autofunction:: get_parser(prog='pep8', version=pep8.__version__)
87+
.. autofunction:: get_parser(prog='pycodestyle', version=pycodestyle.__version__)
8888
.. autofunction:: init_checks_registry()

docs/conf.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# pep8 documentation build configuration file, created by
3+
# pycodestyle documentation build configuration file, created by
44
# sphinx-quickstart on Tue Aug 21 09:47:49 2012.
55
#
66
# This file is execfile()d with the current directory set to its
@@ -44,7 +44,7 @@
4444
master_doc = 'index'
4545

4646
# General information about the project.
47-
project = u'pep8'
47+
project = u'pycodestyle'
4848
authors = u'Johann C. Rocholl, Florent Xicluna, Ian Lee'
4949
copyright = u'2006-2016, %s' % (authors)
5050

@@ -53,11 +53,11 @@
5353
# built documents.
5454
#
5555

56-
pep8_version = __import__('pep8').__version__.split('.')
56+
pkg_version = __import__('pycodestyle').__version__.split('.')
5757
# The short X.Y version.
58-
version = '.'.join(pep8_version[:2])
58+
version = '.'.join(pkg_version[:2])
5959
# The full version, including alpha/beta/rc tags.
60-
release = '.'.join(pep8_version)
60+
release = '.'.join(pkg_version)
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.
@@ -176,7 +176,7 @@
176176
#html_file_suffix = None
177177

178178
# Output file base name for HTML help builder.
179-
htmlhelp_basename = 'pep8doc'
179+
htmlhelp_basename = 'pycodestyledoc'
180180

181181

182182
# -- Options for LaTeX output -------------------------------------------------
@@ -196,7 +196,7 @@
196196
# (source start file, target name, title,
197197
# author, documentclass [howto/manual]).
198198
latex_documents = [
199-
('index', 'pep8.tex', u'pep8 documentation',
199+
('index', 'pycodestyle.tex', u'pycodestyle documentation',
200200
authors, 'manual'),
201201
]
202202

@@ -226,7 +226,7 @@
226226
# One entry per manual page. List of tuples
227227
# (source start file, name, description, authors, manual section).
228228
man_pages = [
229-
('index', 'pep8', u'pep8 documentation',
229+
('index', 'pycodestyle', u'pycodestyle documentation',
230230
[authors], 1)
231231
]
232232

@@ -240,8 +240,8 @@
240240
# (source start file, target name, title, author,
241241
# dir menu entry, description, category)
242242
texinfo_documents = [
243-
('index', 'pep8', u'pep8 documentation', authors,
244-
'pep8', 'One line description of project.',
243+
('index', 'pycodestyle', u'pycodestyle documentation', authors,
244+
'pycodestyle', 'One line description of project.',
245245
'Miscellaneous'),
246246
]
247247

docs/developer.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. currentmodule:: pep8
1+
.. currentmodule:: pycodestyle
22

33
=================
44
Developer's notes
@@ -13,7 +13,7 @@ conditions of the :ref:`Expat license <license>`. Fork away!
1313

1414
* `Source code <https://github.com/pycqa/pycodestyle>`_ and
1515
`issue tracker <https://github.com/pycqa/pycodestyle/issues>`_ on GitHub.
16-
* `Continuous tests <http://travis-ci.org/pycqa/pep8>`_ against Python
16+
* `Continuous tests <http://travis-ci.org/pycqa/pycodestyle>`_ against Python
1717
2.6 through 3.4 and PyPy, on `Travis-CI platform
1818
<http://about.travis-ci.org/>`_.
1919

@@ -25,14 +25,14 @@ Direction
2525

2626
Some high-level aims and directions to bear in mind for contributions:
2727

28-
* ``pep8`` is intended to be as fast as possible.
28+
* ``pycodestyle`` is intended to be as fast as possible.
2929
Using the ``ast`` module defeats that purpose.
3030
The `pep8-naming <https://github.com/flintwork/pep8-naming>`_ plugin exists for this sort of functionality.
3131
* If you want to provide extensibility / plugins,
3232
please see `flake8 <https://gitlab.com/pycqa/flake8>`_ -
33-
``pep8`` doesn't want or need a plugin architecture.
33+
``pycodestyle`` doesn't want or need a plugin architecture.
3434
* Python 2.6 support is still deemed important.
35-
* ``pep8`` aims to have no external dependencies.
35+
* ``pycodestyle`` aims to have no external dependencies.
3636

3737

3838
Contribute
@@ -89,17 +89,17 @@ Several docstrings contain examples directly from the `PEP 8`_ document.
8989
Okay: spam(ham[1], {eggs: 2})
9090
E201: spam( ham[1], {eggs: 2})
9191

92-
These examples are verified automatically when pep8.py is run with the
92+
These examples are verified automatically when pycodestyle.py is run with the
9393
``--doctest`` option. You can add examples for your own check functions.
9494
The format is simple: ``"Okay"`` or error/warning code followed by colon
9595
and space, the rest of the line is example source code. If you put ``'r'``
9696
before the docstring, you can use ``\n`` for newline and ``\t`` for tab.
9797

9898
Then be sure to pass the tests::
9999

100-
$ python pep8.py --testsuite testsuite
101-
$ python pep8.py --doctest
102-
$ python pep8.py --verbose pep8.py
100+
$ python pycodestyle.py --testsuite testsuite
101+
$ python pycodestyle.py --doctest
102+
$ python pycodestyle.py --verbose pycodestyle.py
103103

104104
When contributing to pycodestyle, please observe our `Code of Conduct`_.
105105

docs/index.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.. pep8 documentation master file
1+
.. pycodestyle documentation master file
22
3-
pep8's documentation
4-
====================
3+
pycodestyle's documentation
4+
===========================
55

66
*Python style guide checker*
77

8-
pep8 is a tool to check your Python code against some of the style
9-
conventions in `PEP 8`_.
8+
pycodestyle (formerly pep8) is a tool to check your Python code against some of
9+
the style conventions in `PEP 8`_.
1010

1111
.. _PEP 8: http://www.python.org/dev/peps/pep-0008/
1212

@@ -45,7 +45,7 @@ Maintained by Florent Xicluna and Ian Lee.
4545
License
4646
=======
4747

48-
The ``pep8`` library is provided under the terms and conditions of the
48+
The ``pycodestyle`` library is provided under the terms and conditions of the
4949
Expat license::
5050

5151
# Permission is hereby granted, free of charge, to any person

docs/intro.rst

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.. currentmodule:: pep8
1+
.. currentmodule:: pycodestyle
22

33
Introduction
44
============
55

6-
pep8 is a tool to check your Python code against some of the style
6+
pycodestyle is a tool to check your Python code against some of the style
77
conventions in `PEP 8`_.
88

99
.. contents::
@@ -18,7 +18,7 @@ Features
1818
* Parseable output: Jump to error location in your editor.
1919

2020
* Small: Just one Python file, requires only stdlib. You can use just
21-
the pep8.py file for this purpose.
21+
the pycodestyle.py file for this purpose.
2222

2323
* Comes with a comprehensive test suite.
2424

@@ -40,7 +40,7 @@ Always remember this statement from `PEP 8`_:
4040

4141

4242
Among other things, these features are currently not in the scope of
43-
the ``pep8`` library:
43+
the ``pycodestyle`` library:
4444

4545
* **naming conventions**: this kind of feature is supported through plugins.
4646
Install `flake8 <https://pypi.python.org/pypi/flake8>`_ and the
@@ -55,24 +55,19 @@ the ``pep8`` library:
5555
Installation
5656
------------
5757

58-
You can install, upgrade, uninstall pep8.py with these commands::
58+
You can install, upgrade, uninstall pycodestyle.py with these commands::
5959

60-
$ pip install pep8
61-
$ pip install --upgrade pep8
62-
$ pip uninstall pep8
63-
64-
There's also a package for Debian/Ubuntu, but it's not always the
65-
latest version::
66-
67-
$ sudo apt-get install pep8
60+
$ pip install pycodestyle
61+
$ pip install --upgrade pycodestyle
62+
$ pip uninstall pycodestyle
6863

6964

7065
Example usage and output
7166
------------------------
7267

7368
::
7469

75-
$ pep8 --first optparse.py
70+
$ pycodestyle --first optparse.py
7671
optparse.py:69:11: E401 multiple imports on one line
7772
optparse.py:77:1: E302 expected 2 blank lines, found 1
7873
optparse.py:88:5: E301 expected 1 blank line, found 0
@@ -82,10 +77,10 @@ Example usage and output
8277
optparse.py:472:29: E221 multiple spaces before operator
8378
optparse.py:544:21: W601 .has_key() is deprecated, use 'in'
8479

85-
You can also make pep8.py show the source code for each error, and
80+
You can also make pycodestyle.py show the source code for each error, and
8681
even the relevant text from PEP 8::
8782

88-
$ pep8 --show-source --show-pep8 testsuite/E40.py
83+
$ pycodestyle --show-source --show-pep8 testsuite/E40.py
8984
testsuite/E40.py:2:10: E401 multiple imports on one line
9085
import os, sys
9186
^
@@ -97,7 +92,7 @@ even the relevant text from PEP 8::
9792

9893
Or you can display how often each error was found::
9994

100-
$ pep8 --statistics -qq Python-2.5/Lib
95+
$ pycodestyle --statistics -qq Python-2.5/Lib
10196
232 E201 whitespace after '['
10297
599 E202 whitespace before ')'
10398
631 E203 whitespace before ','
@@ -113,13 +108,13 @@ Or you can display how often each error was found::
113108

114109
You can also make pep8.py show the error text in different formats by using --format having options default/pylint/custom::
115110

116-
$ pep8 testsuite/E40.py --format=default
111+
$ pycodestyle testsuite/E40.py --format=default
117112
testsuite/E40.py:2:10: E401 multiple imports on one line
118113

119-
$ pep8 testsuite/E40.py --format=pylint
114+
$ pycodestyle testsuite/E40.py --format=pylint
120115
testsuite/E40.py:2: [E401] multiple imports on one line
121116

122-
$ pep8 testsuite/E40.py --format='%(path)s|%(row)d|%(col)d| %(code)s %(text)s'
117+
$ pycodestyle testsuite/E40.py --format='%(path)s|%(row)d|%(col)d| %(code)s %(text)s'
123118
testsuite/E40.py|2|10| E401 multiple imports on one line
124119

125120
Variables in the ``custom`` format option
@@ -140,8 +135,8 @@ Variables in the ``custom`` format option
140135

141136
Quick help is available on the command line::
142137

143-
$ pep8 -h
144-
Usage: pep8 [options] input ...
138+
$ pycodestyle -h
139+
Usage: pycodestyle [options] input ...
145140

146141
Options:
147142
--version show program's version number and exit
@@ -421,7 +416,7 @@ special comment. This possibility should be reserved for special cases.
421416

422417
Note: most errors can be listed with such one-liner::
423418

424-
$ python pep8.py --first --select E,W testsuite/ --format '%(code)s: %(text)s'
419+
$ python pycodestyle.py --first --select E,W testsuite/ --format '%(code)s: %(text)s'
425420

426421

427422
.. _related-tools:
@@ -430,9 +425,9 @@ Related tools
430425
-------------
431426

432427
The `flake8 checker <https://flake8.readthedocs.io>`_ is a wrapper around
433-
``pep8`` and similar tools. It supports plugins.
428+
``pycodestyle`` and similar tools. It supports plugins.
434429

435-
Other tools which use ``pep8`` are referenced in the Wiki: `list of related
430+
Other tools which use ``pycodestyle`` are referenced in the Wiki: `list of related
436431
tools <https://github.com/pycqa/pycodestyle/wiki/RelatedTools>`_.
437432

438433
.. _PEP 8: http://www.python.org/dev/peps/pep-0008/

0 commit comments

Comments
 (0)