Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge into Master #1296

merged 25 commits into from Oct 1, 2017

Merge into Master #1296

merged 25 commits into from Oct 1, 2017


Copy link

@waylan waylan commented Sep 28, 2017

Let's move our primary development onto the 1.0 branch by merging that into master.

I have pushed up a 0.16 branch which is the current state of master. Any future bugfixes that would make for a good candidate for a 0.16.x bugfix release can then be backported from master. That's easier to manage than forward-porting bugfixes from master to It also removes the need to then merge all that back to master later (I had to resolve a lot of conflicts to get this in shape, don't want to have to do that again).

Warning, I rebased with master, so any existing clones/forks won't merge with this directly. However, I did the work in a private branch and have not pushed the rebase publicly. Therefore, the branch here on GitHub is left alone for reference purposes. It should simply be considered inactive.

@waylan waylan force-pushed the waylan:dev branch 2 times, most recently from 9e9f09b to 481d989 Sep 28, 2017
waylan and others added 15 commits Mar 24, 2017
All Markdown handling is now contained within the `Page` object, which
external code no longer needs to know the internals of.
A slightly different approach to the work started in #713.

Include the multimarkdown meta-data parser from docdata

Tests have been updated. However, as noted in #713, they could use
some refactoring. The existing tests all pass. We can leave refactoring
as a seperate matter from this.

Closes #713.
Themes now have `theme` objects, and theme specific configs.
Themes can inherit from other themes. Users (and theme authors)
can define custom static templates and variables.
See the included documentation for a full explanation of the API.

Search has been removed and wrapped in a plugin (named "legacy_search").
The search feature was ported as-is. None of the open issues with search
have been addressed. Presumably, a new search plugin will be built from
the ground up which addresses those issues.

Note that there is no 'default' plugins. That means that users get no
search unless they enable it in the config by adding the following to
their `mkdocs.yml` file:

        - legacy_search

Fixes #206
This option type can be used to validate that a specified
file exists.
- makes events available in a module constant
  - can be used by plugins for inspection
- ensures that registered attributes are actually callable
- does not ignore other results than None that also evaluate
  as False in a condition
This can be used for a sequence of SubConfigs.
Also retains all errors of a plugin config.
This allows to override the loading of source files,
e.g. to fetch it from a remote location or for
generated contents.
@waylan waylan force-pushed the waylan:dev branch from 481d989 to b973802 Sep 28, 2017
@waylan waylan force-pushed the waylan:dev branch from f775f10 to d851242 Sep 28, 2017
@waylan waylan merged commit f90c44a into mkdocs:master Oct 1, 2017
3 checks passed
3 checks passed
codecov/project 93.03% (target 90%)
continuous-integration/appveyor/pr AppVeyor build succeeded
continuous-integration/travis-ci/pr The Travis CI build passed
@waylan waylan deleted the waylan:dev branch Oct 1, 2017
@waylan waylan added this to the 1.0.0 milestone Oct 1, 2017
@waylan waylan added the Process label Oct 1, 2017
@waylan waylan mentioned this pull request Oct 1, 2017
jamesrhea added a commit to jamesrhea/mkdocs that referenced this pull request Feb 15, 2018
"Officially added support for Python 3.6 (mkdocs#1296)" as of version 0.17.0.

waylan added a commit that referenced this pull request Apr 3, 2018
"Officially added support for Python 3.6 (#1296)" as of version 0.17.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants