Skip to content

Commit 2410ba0

Browse files
authored
Merge pull request #113 from alexdlaird/master
Adding index.rst and Auto-Generated TOC
2 parents 93c3b00 + 8b67cc1 commit 2410ba0

File tree

6 files changed

+510
-588
lines changed

6 files changed

+510
-588
lines changed

Makefile

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
.PHONY: all virtualenv install nopyc clean docs
2+
3+
SHELL := /usr/bin/env bash
4+
PYTHON_BIN ?= python
5+
6+
all: virtualenv install
7+
8+
virtualenv:
9+
@if [ ! -d "venv" ]; then \
10+
$(PYTHON_BIN) -m pip install virtualenv --user; \
11+
$(PYTHON_BIN) -m virtualenv venv; \
12+
fi
13+
14+
install: virtualenv
15+
@( \
16+
source venv/bin/activate; \
17+
python -m pip install -r requirements.txt; \
18+
)
19+
20+
nopyc:
21+
find . -name '*.pyc' | xargs rm -f || true
22+
find . -name __pycache__ | xargs rm -rf || true
23+
24+
clean: nopyc
25+
rm -rf _build dist *.egg-info venv
26+
27+
docs: install
28+
@( \
29+
source venv/bin/activate; \
30+
python -m pip install -r docs/requirements.txt; \
31+
sphinx-build -M html docs _build/docs; \
32+
)
33+

README.rst

+11-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ Here’s what Confuse brings to the table:
4242
from the standard library. Use argparse's declarative API to allow
4343
command-line options to override configured defaults.
4444

45+
Installation
46+
------------
47+
48+
Confuse is available on [PyPI](https://pypi.org/project/confuse/) and can be installed
49+
using :code:`pip`:
50+
51+
.. code-block:: sh
52+
53+
pip install confuse
54+
4555
Using Confuse
4656
-------------
4757

@@ -58,6 +68,6 @@ Like beets, it is available under the `MIT license`_.
5868
.. _optparse: http://docs.python.org/dev/library/optparse.html
5969
.. _argparse: http://docs.python.org/dev/library/argparse.html
6070
.. _logging: http://docs.python.org/library/logging.html
61-
.. _Confuse's documentation: http://confuse.readthedocs.org/
71+
.. _Confuse's documentation: http://confuse.readthedocs.org/usage.html
6272
.. _MIT license: http://www.opensource.org/licenses/mit-license.php
6373
.. _beets: https://github.com/beetbox/beets

docs/Makefile

-130
This file was deleted.

0 commit comments

Comments
 (0)