Commit Graph

175 Commits

Author SHA1 Message Date
Ed Brannin
9202ffdff8 Updated setup.py to use entry_points['console_scripts'] instead of scripts.
This makes a "mkdocs" command on Windows/OSX/Linux without any platform-specific code in setup.py.

I think this is the preferred way to install a Python command with setuptools.

It is, at least, the method used by:

* [flake8](8ee94d1eee/setup.py)
* [coverage.py](ca875e7390/setup.py)
* [Fabric](https://github.com/fabric/fabric/blob/master/setup.py)
* Many others

In the past, I had to change imports willy-nilly or add
"from __future__ import absolute_imports" to a bunch of files.
This is because I was renaming "mkdocs" to "mkdocs.py" instead of "main.py",
and the module-vs-script name clash was confusing imports from other files.
2014-08-17 00:01:45 -04:00
Dougal Matthews
db0644dacf Merge pull request #74 from sampsyo/master
Configurable Markdown extensions
2014-08-12 14:59:44 +01:00
Dougal Matthews
189625cfc8 Merge pull request #103 from sloria/python3
Added support for Python 3.3 and 3.4.
2014-08-11 08:39:09 +01:00
sloria
f35f91fce2 Import print_function in build.py 2014-08-10 15:12:10 -04:00
Dougal Matthews
7d4ef4cb77 Merge pull request #118 from rlabrecque/patch-1
Updated license.md with theme license links
2014-08-10 18:52:01 +01:00
Riley Labrecque
25047f04fe Updated docs/about/license.md with theme license links 2014-08-10 05:40:15 -06:00
sloria
57f0ceb111 Prevent ResourceWarning due to unclosed file 2014-08-09 20:22:48 -04:00
sloria
25188f0a5b Add future import; remove unnecssary lines in compat.py 2014-08-09 20:18:53 -04:00
sloria
dac0d4b748 Fix unquote compatibility 2014-08-09 20:18:53 -04:00
sloria
9334d6b05c Fix a few encoding errors 2014-08-09 20:18:06 -04:00
sloria
5fe3c93476 Fix httpserver and socketserver compatibility with py3 2014-08-09 20:18:06 -04:00
sloria
6ff32de768 Fix ordering of imports as per the project's conventions
Always order imports alphabetically
2014-08-09 20:17:08 -04:00
sloria
05dc58bfcc Minor style fixes as per @tomchristie's code review 2014-08-09 20:17:08 -04:00
sloria
69213ae658 Fix all py3 syntax errors; All tests passing 2014-08-09 20:17:08 -04:00
sloria
8a2fb34368 Fix urlparse py2/3 compatiblity in build.py and config.py 2014-08-09 20:15:11 -04:00
sloria
20eda86df7 Add python 2/3 compatibility module 2014-08-09 20:15:10 -04:00
sloria
1b3ffd76a0 Test against py33 and py34 2014-08-09 20:15:10 -04:00
Adrian Sampson
4489a04cc9 Fix comment copypasta error 2014-08-08 14:58:13 -07:00
Adrian Sampson
c82f55e6fb Add test for duplicated custom extension names 2014-08-08 14:57:19 -07:00
Adrian Sampson
38210c714a Add test for extension enabling
I didn't use the SmartyPants extension here because the version of
python-markdown pinned here (2.3.1) doesn't include the extension. 2.4 does;
maybe the project should consider updating this dependency.
2014-08-08 14:57:19 -07:00
Adrian Sampson
4e66ed6ce9 Fix crash when markdown_extensions is not set
This lets the value be a tuple as well as a list. (Never really understood why
Python won't concatenate lists and tuples.)
2014-08-08 14:57:19 -07:00
Adrian Sampson
c60b3b6dcf Add docs for markdown_extensions 2014-08-08 14:57:19 -07:00
Adrian Sampson
f33b1b1928 Configurable Markdown extensions
This lets the YAML configuration specify a list of Python Markdown extensions
to enable (on top of the default set). This is especially handy, for example,
when you want nice typography via the SmartyPants extension.
2014-08-08 14:57:19 -07:00
Dougal Matthews
49c81a6009 Merge pull request #117 from d0ugal/master
Add building docs as an integration test
2014-08-08 22:29:33 +02:00
Dougal Matthews
2fc3bd2dde Add building docs as an integration test 2014-08-08 21:08:46 +01:00
Tom Christie
8ddd54cb51 Merge pull request #112 from frac/patch-1
just adding the gh-deploy option to the help msg
2014-08-06 16:05:41 +01:00
Dougal Matthews
85d51a0a88 Merge pull request #115 from d0ugal/build-fix
Add the homepage to SiteNavigation.__str__
2014-08-06 17:01:39 +02:00
Dougal Matthews
e51cf87949 Add the homepage to SiteNavigation.__str__
A number of tests expected home to be included in the __str__ output for
SiteNavigation. Home isn't included as it isn't stored in
SiteNavigation.nav_items with the other pages.

This change adds it to the __str__ output and updates the expected
length for SiteNavigation.nav_items in the tests.
2014-08-06 11:01:28 +01:00
adriano petrich
4b0bbe123c just adding the gh-deploy option to the help msg 2014-07-31 11:48:33 +01:00
Tom Christie
d1bab80e10 Merge branch 'master' of github.com:tomchristie/mkdocs 2014-07-20 19:04:09 +01:00
Tom Christie
7167406bc9 Ye gads 2014-07-20 19:03:50 +01:00
Tom Christie
8a85ccaf54 Merge pull request #88 from JimPanic/patch-2
Add actual documentation
2014-05-21 15:36:35 +01:00
Tom Christie
ac9ce2e548 Merge pull request #89 from JimPanic/fix-build
Fix build error caused by wrong indentation
2014-05-21 15:36:29 +01:00
Tom Christie
91a545f481 Merge pull request #87 from JimPanic/patch-1
Set the correct key for the favicon
2014-05-21 15:36:24 +01:00
Alexander Pánek
175a8fa2aa Fix build error caused by wrong indentation 2014-05-21 15:30:25 +02:00
Alexander Pánek
4a263298e2 Add actual documentation
* site_url
* site_author
* site_description
* site_favicon
2014-05-21 15:17:06 +02:00
Alexander Pánek
7722e0d2d8 Set the correct key for the favicon
`favicon` is used throughout the themes, build.py used `site_favicon`.
2014-05-21 15:08:45 +02:00
Tom Christie
ad4992260b Merge pull request #79 from grena/patch-1
Fix typo
2014-04-18 13:16:42 +01:00
Adrien PETREMANN
795346898e Fix typo 2014-04-17 23:02:46 +02:00
Tom Christie
2d92dae9a2 Comment tweaks 2014-04-01 19:52:49 +01:00
Tom Christie
ed594366f7 Tweaks to automatically generated filenames 2014-04-01 19:33:57 +01:00
Tom Christie
7def968d19 Don't pause before rebuilds 2014-04-01 18:28:26 +01:00
Tom Christie
1d0d96e03d Fix broken indentation 2014-04-01 18:28:11 +01:00
Tom Christie
dd079c81be Version 0.9 0.9 2014-03-31 16:57:52 +01:00
Tom Christie
18b8c8cafc Support both remote URL styles in gh-deploy. 2014-03-31 16:56:49 +01:00
Tom Christie
c38db61980 Add automatic naming for included pages. 2014-03-31 16:56:17 +01:00
Tom Christie
31659362b0 Version 0.8 0.8 2014-03-31 15:08:01 +01:00
Tom Christie
b5ab105b52 Pause slightly before re-creating site after filesystem events 2014-03-31 15:06:01 +01:00
Tom Christie
9867440a83 Include final newline in initial mkdocs.yml file 2014-03-31 15:05:07 +01:00
Tom Christie
98796687ad Version 0.7 0.7 2014-03-31 14:36:54 +01:00