diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..e1fef8e0a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +# Copyright (c) 2016-2020 Martin Donath + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +.git +.github +docs +node_modules +src diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05563889c..ab2a967dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,14 +80,14 @@ jobs: with: python-version: 3.x - - uses: actions/cache@v1 - id: cache-python - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + # - uses: actions/cache@v1 + # id: cache-python + # with: + # path: ~/.cache/pip + # key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - - if: steps.cache-python.outputs.cache-hit != 'true' - run: pip install -r requirements.txt + # - if: steps.cache-python.outputs.cache-hit != 'true' + - run: pip install -r requirements.txt # Set configuration for repository and deploy documentation - env: @@ -100,8 +100,10 @@ jobs: git config --global user.email "${GH_EMAIL}" git remote set-url origin ${REMOTE} - # Install theme - - run: python setup.py install + # Install theme and dependencies + - run: | + python setup.py install + pip install mkdocs-minify-plugin>=0.2 # Build documentation - env: diff --git a/CHANGELOG b/CHANGELOG index fa445e05b..3b9df0364 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +mkdocs-material 4.6.3 (2020-02-14) + + * Removed optional third-party plugins from requirements.txt + * Updated Docker image to contain all supported third-party plugins + mkdocs-material 4.6.2 (2020-02-08) * Added Romanian translations diff --git a/Dockerfile b/Dockerfile index 935181ce2..5abc28421 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -FROM python:3.6.8-alpine3.9 +FROM python:3.8.1-alpine3.11 # Set build directory WORKDIR /tmp @@ -38,7 +38,10 @@ RUN \ git-fast-import \ openssh \ && python setup.py install \ - && rm -rf /tmp/* + && rm -rf /tmp/* \ + && pip install --no-cache-dir \ + 'mkdocs-minify-plugin>=0.2' \ + 'mkdocs-git-revision-date-localized-plugin>=0.4' # Set working directory WORKDIR /docs diff --git a/docs/release-notes.md b/docs/release-notes.md index b2cd97dc2..19e84bb4e 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -64,6 +64,11 @@ pip show mkdocs-material ## Changelog +### 4.6.3 _ February 14, 2020 + +* Removed optional third-party plugins from `requirements.txt` +* Updated Docker image to contain all supported third-party plugins + ### 4.6.2 _ February 8, 2020 * Added Romanian translations diff --git a/material/partials/search.html b/material/partials/search.html index c17d3369b..4742800f3 100644 --- a/material/partials/search.html +++ b/material/partials/search.html @@ -6,7 +6,7 @@