summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Quast <contact@jeffquast.com>2015-05-09 15:17:10 -0700
committerJeff Quast <contact@jeffquast.com>2015-05-09 15:17:10 -0700
commit621e6e35fc001a4681653885678eb585ca59b9e1 (patch)
treef395fc375350e4d8feca742124f68936f7f25938
parent4ca709641dc7c9e1fdf3101baffdb3d2416e045a (diff)
parentca33be09d78b755070e7e2d1a449f267e0fa74aa (diff)
downloadblessings-621e6e35fc001a4681653885678eb585ca59b9e1.tar.gz
Merge pull request #112 from erikrose/spellfix-derivitive
Spellfix derivitive, set symlink direction
l---------CONTRIBUTING1
-rw-r--r--CONTRIBUTING.rst42
-rw-r--r--blessings/formatters.py4
l---------[-rw-r--r--]docs/contributing.rst43
4 files changed, 45 insertions, 45 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING
deleted file mode 120000
index 7c5f320..0000000
--- a/CONTRIBUTING
+++ /dev/null
@@ -1 +0,0 @@
-docs/contributing.rst \ No newline at end of file
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 0000000..7018671
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,42 @@
+Contributing
+============
+
+We welcome contributions via GitHub pull requests:
+
+- `Fork a Repo <https://help.github.com/articles/fork-a-repo/>`_
+- `Creating a pull request
+ <https://help.github.com/articles/creating-a-pull-request/>`_
+
+Developing
+----------
+
+Install git, Python 2 and 3, pip, and tox.
+
+Then, from the blessings code folder::
+
+ pip install --editable .
+
+Running Tests
+~~~~~~~~~~~~~
+
+Install and run tox
+
+::
+
+ pip install --upgrade tox
+ tox
+
+Test Coverage
+~~~~~~~~~~~~~
+
+Blessings has 99% code coverage, and we'd like to keep it that way, as
+terminals are fiddly beasts. Thus, when you contribute a new feature, make sure
+it is covered by tests. Likewise, a bug fix should include a test demonstrating
+the bug.
+
+Style and Static Analysis
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The test runner (``tox``) ensures all code and documentation complies
+with standard python style guides, pep8 and pep257, as well as various
+static analysis tools.
diff --git a/blessings/formatters.py b/blessings/formatters.py
index 8a0f4e4..de99529 100644
--- a/blessings/formatters.py
+++ b/blessings/formatters.py
@@ -14,8 +14,8 @@ def _make_colors():
"""
derivatives = ('on', 'bright', 'on_bright',)
colors = set('black red green yellow blue magenta cyan white'.split())
- return set(['_'.join((_derivitive, _color))
- for _derivitive in derivatives
+ return set(['_'.join((_deravitive, _color))
+ for _deravitive in derivatives
for _color in colors]) | colors
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 7018671..798f2aa 100644..120000
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -1,42 +1 @@
-Contributing
-============
-
-We welcome contributions via GitHub pull requests:
-
-- `Fork a Repo <https://help.github.com/articles/fork-a-repo/>`_
-- `Creating a pull request
- <https://help.github.com/articles/creating-a-pull-request/>`_
-
-Developing
-----------
-
-Install git, Python 2 and 3, pip, and tox.
-
-Then, from the blessings code folder::
-
- pip install --editable .
-
-Running Tests
-~~~~~~~~~~~~~
-
-Install and run tox
-
-::
-
- pip install --upgrade tox
- tox
-
-Test Coverage
-~~~~~~~~~~~~~
-
-Blessings has 99% code coverage, and we'd like to keep it that way, as
-terminals are fiddly beasts. Thus, when you contribute a new feature, make sure
-it is covered by tests. Likewise, a bug fix should include a test demonstrating
-the bug.
-
-Style and Static Analysis
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The test runner (``tox``) ensures all code and documentation complies
-with standard python style guides, pep8 and pep257, as well as various
-static analysis tools.
+../CONTRIBUTING.rst \ No newline at end of file