From 3f652957a8a5f2622e63c0761d46cf673f477baa Mon Sep 17 00:00:00 2001 From: jholdstock Date: Fri, 5 Jan 2024 08:26:30 +0000 Subject: [PATCH 1/3] Update mkdocs-material to 9.5.3. Includes lots of minor bug fixes, a smaller docker image, faster build times, and using a new emoji extension. --- .github/workflows/docker.yml | 2 +- .github/workflows/python.yml | 4 ++-- mkdocs.yml | 4 ++-- requirements.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 477ae327e..2087f2ad8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,7 +5,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Build the Docker image run: docker build -t decred/dcrdocs:$(date +%s) . diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 4517b5684..eb69a0ade 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -9,9 +9,9 @@ jobs: python-version: [3.11] steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0 + uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/mkdocs.yml b/mkdocs.yml index 6cfba5b30..4651f1a63 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -87,8 +87,8 @@ markdown_extensions: - pymdownx.tilde - pymdownx.caret - pymdownx.emoji: - emoji_index: !!python/name:materialx.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_index: !!python/name:material.extensions.emoji.twemoji + emoji_generator: !!python/name:material.extensions.emoji.to_svg - pymdownx.tabbed: alternate_style: true - pymdownx.superfences diff --git a/requirements.txt b/requirements.txt index 85e679db5..b5bf3a9a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -mkdocs-material==9.2.6 +mkdocs-material==9.5.3 mkdocs-markdownextradata-plugin==0.2.5 From f0a498227ebed3920a6d4a99f66bea90823c97ff Mon Sep 17 00:00:00 2001 From: jholdstock Date: Thu, 9 May 2024 11:10:49 +0100 Subject: [PATCH 2/3] Update mkdocs-material to 9.5.21. This is an important update as it fixes the currently failing master build. ref: squidfunk/mkdocs-material#6983 --- .github/workflows/docker.yml | 2 +- .github/workflows/python.yml | 4 ++-- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2087f2ad8..bd76fbce2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,7 +5,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Build the Docker image run: docker build -t decred/dcrdocs:$(date +%s) . diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index eb69a0ade..0724a0e40 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -9,9 +9,9 @@ jobs: python-version: [3.11] steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 + uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/requirements.txt b/requirements.txt index b5bf3a9a6..4f7d9f716 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -mkdocs-material==9.5.3 +mkdocs-material==9.5.21 mkdocs-markdownextradata-plugin==0.2.5 From 5ac2a7e95f0bf85cd47b9fc247cb9d56dccd49aa Mon Sep 17 00:00:00 2001 From: jholdstock Date: Thu, 9 May 2024 11:24:14 +0100 Subject: [PATCH 3/3] Update copyright year to 2024. --- LICENSE | 2 +- docs/about/license.md | 2 +- mkdocs.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 5df4e4f99..e609e06ca 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ ISC License -Copyright (c) 2018-2023 The Decred developers +Copyright (c) 2018-2024 The Decred developers Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/docs/about/license.md b/docs/about/license.md index de458bb18..5fd170106 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -5,7 +5,7 @@ dcrdocs is licensed under the [copyfree](http://copyfree.org) ISC License. --- Copyright © 2013-2015 The btcsuite developers. -Copyright © 2015-2023 The Decred developers. +Copyright © 2015-2024 The Decred developers. Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. diff --git a/mkdocs.yml b/mkdocs.yml index 4651f1a63..a9e1bfe48 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -276,4 +276,4 @@ nav: - 'Glossary': 'glossary.md' - About: - 'License': 'about/license.md' -copyright: If you wish to improve this site, please open an issue or send a pull request.
dcrdocs v0.0.3. Decred Project 2016-2023. +copyright: If you wish to improve this site, please open an issue or send a pull request.
dcrdocs v0.0.3. Decred Project 2016-2024.