From 42c222a6c8957cc55d1e5eada303b71a83cdc2cd Mon Sep 17 00:00:00 2001 From: Micah Jerome Ellison Date: Sat, 12 Dec 2020 11:54:20 -0800 Subject: [PATCH 01/38] Update bug_report.md Fix commented out text appearing in comments --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2fbc9196..d546614f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -15,7 +15,7 @@ Please fill out the points below, as it will make our process much easier. ### Environment - - Jrnl `--diagnostic` output: + - `jrnl --diagnostic` output: - Install method: ### Current Behavior From 558d331d66db966c93f5adfec4bce65b7a654227 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 12 Dec 2020 12:05:12 -0800 Subject: [PATCH 02/38] Make docs site (jrnl.sh) fully meet Web Content Accessibility Guidelines (WCAG) 2.1 (#1105) * add some attribtutes to docs template for accessbility * fix colors to meet accessibility guidelines (4.5 contrast ratio for text) * Fix last remaining pa11y error (no button on search form) This fix required moving the mkdocs theme out of the docs directory. It's no in the docs_theme directory, and the mkdocs config is updated accordingly. * Re-enable accessibility testing for docs sit Also, move the pa11y script into the gh actions workflow * clean up linting issues in css * fix and standardize link colors across site * fix twitter button opacity making text fail contrast requirements * move buttons on docs site index nav, tweak font weights * fix footer opacity, tweak spacing of the now more visible sections of the page * change font sizes on index page to meet WCAG * udpate font sizes site-wide for accessibility * fix sidebar for accessibility (font sizes and color contrasts) * restyle code blocks to have dark background, and meet accessibility requirements * standardize (accessible) colors across docs site --- .github/workflows/docs.yaml | 27 +- .github/workflows/pa11y.sh | 20 -- docs/assets/highlight.css | 79 ----- docs/assets/theme.css | 204 ----------- docs/formats.md | 5 +- docs/installation.md | 4 +- docs/theme/img/sprites.svg | 18 - docs/theme/index.css | 307 ----------------- docs/usage.md | 2 +- {docs => docs_theme}/CNAME | 0 docs_theme/assets/colors.css | 28 ++ docs_theme/assets/highlight.css | 130 +++++++ docs_theme/assets/index.css | 317 ++++++++++++++++++ {docs => docs_theme}/assets/readme-header.png | Bin docs_theme/assets/theme.css | 311 +++++++++++++++++ {docs/theme => docs_theme}/img/banner_og.png | Bin .../img/banner_twitter.png | Bin {docs/theme => docs_theme}/img/favicon.ico | Bin {docs/theme => docs_theme}/img/favicon.svg | 0 {docs/theme => docs_theme}/img/jrnl_white.svg | 0 {docs/theme => docs_theme}/img/logo.svg | 0 {docs/theme => docs_theme}/img/logo_white.svg | 0 docs_theme/img/sprites.svg | 1 + {docs/theme => docs_theme}/index.html | 13 +- {docs/theme => docs_theme}/index.js | 0 docs_theme/main.html | 8 + {docs => docs_theme}/requirements.txt | 0 mkdocs.yml | 3 +- readthedocs.yml | 2 +- 29 files changed, 835 insertions(+), 644 deletions(-) delete mode 100755 .github/workflows/pa11y.sh delete mode 100644 docs/assets/highlight.css delete mode 100644 docs/assets/theme.css delete mode 100644 docs/theme/img/sprites.svg delete mode 100644 docs/theme/index.css rename {docs => docs_theme}/CNAME (100%) create mode 100644 docs_theme/assets/colors.css create mode 100644 docs_theme/assets/highlight.css create mode 100644 docs_theme/assets/index.css rename {docs => docs_theme}/assets/readme-header.png (100%) create mode 100644 docs_theme/assets/theme.css rename {docs/theme => docs_theme}/img/banner_og.png (100%) rename {docs/theme => docs_theme}/img/banner_twitter.png (100%) rename {docs/theme => docs_theme}/img/favicon.ico (100%) rename {docs/theme => docs_theme}/img/favicon.svg (100%) rename {docs/theme => docs_theme}/img/jrnl_white.svg (100%) rename {docs/theme => docs_theme}/img/logo.svg (100%) rename {docs/theme => docs_theme}/img/logo_white.svg (100%) create mode 100644 docs_theme/img/sprites.svg rename {docs/theme => docs_theme}/index.html (95%) rename {docs/theme => docs_theme}/index.js (100%) create mode 100644 docs_theme/main.html rename {docs => docs_theme}/requirements.txt (100%) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index acbbf49f..f73722f5 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -5,14 +5,18 @@ on: branches: [ develop, release ] paths: - 'docs/**' + - 'docs_theme/**' - 'mkdocs.yml' - 'readthedocs.yml' + - '.github/workflows/docs.yaml' pull_request_target: branches: [ develop ] paths: - 'docs/**' + - 'docs_theme/**' - 'mkdocs.yml' - 'readthedocs.yml' + - '.github/workflows/docs.yaml' jobs: accessibility: @@ -47,14 +51,31 @@ jobs: run: poetry run mkdocs serve & - name: Accessibility testing (Pa11y) - run: poetry run .github/workflows/pa11y.sh + env: + site_url: http://127.0.0.1:8000 + exit_code: 0 + run: | + set +e + + poetry run mkdocs build + mkdir -p "reports" + + printf -- 'scanning: /\n' + ./node_modules/.bin/pa11y "$site_url" --reporter junit > "reports/root.xml" || exit_code=2 + + for file in $(poetry run xq '.urlset.url[].loc' site/sitemap.xml -r | sed -r 's!https://jrnl.sh/(.*?)/$!\1!'); do + printf -- 'scanning: /%s\n' "$file" + ./node_modules/.bin/pa11y "$site_url/$file" --reporter junit > "reports/$file.xml" || exit_code=2 + done + + exit $exit_code - name: Upload Unit Test Results if: always() uses: actions/upload-artifact@v2 with: name: Unit Test Results (pa11y) - path: reports/pa11y/*.xml + path: reports/*.xml publish-test-results: if: success() || failure() @@ -70,7 +91,7 @@ jobs: - name: Publish Unit Test Results uses: EnricoMi/publish-unit-test-result-action@v1.4 - if: always() + if: success() || failure() with: github_token: ${{ secrets.GITHUB_TOKEN }} check_name: Unit Test Results diff --git a/.github/workflows/pa11y.sh b/.github/workflows/pa11y.sh deleted file mode 100755 index d6851364..00000000 --- a/.github/workflows/pa11y.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/bash -set +e - -reports_dir="reports/pa11y" -site_url="http://127.0.0.1:8000" -exit_code=0 - -mkdocs build -mkdir -p "$reports_dir" - -printf -- 'scanning: /\n' -./node_modules/.bin/pa11y "$site_url" --reporter junit > "$reports_dir/root.xml" || exit_code=2 - -for file in $(xq '.urlset.url[].loc' site/sitemap.xml -r | sed -r 's!https://jrnl.sh/(.*?)/$!\1!'); do - printf -- 'scanning: /%s\n' "$file" - ./node_modules/.bin/pa11y "$site_url/$file" --reporter junit > "$reports_dir/$file.xml" || exit_code=2 -done - -# exit $exit_code -exit 0 # ignore for now since there are so many warnings diff --git a/docs/assets/highlight.css b/docs/assets/highlight.css deleted file mode 100644 index 46eeb25c..00000000 --- a/docs/assets/highlight.css +++ /dev/null @@ -1,79 +0,0 @@ -/* - -Atom One Dark With support for ReasonML by Gidi Morris, based off work by Daniel Gamage - -Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax - -*/ -.hljs { - display: block; - overflow-x: auto; - padding: 0.5em; - line-height: 1.3em; - color: #e2e8f2; - background: #383e49; - border-radius: 5px; - font-size: 0.9rem; - line-height: 1.3rem; -} -.hljs-keyword, .hljs-operator { - color: #F92672; -} -.hljs-pattern-match { - color: #F92672; -} -.hljs-pattern-match .hljs-constructor { - color: #61aeee; -} -.hljs-function { - color: #61aeee; -} -.hljs-function .hljs-params { - color: #A6E22E; -} -.hljs-function .hljs-params .hljs-typing { - color: #FD971F; -} -.hljs-module-access .hljs-module { - color: #7e57c2; -} -.hljs-constructor { - color: #e2b93d; -} -.hljs-constructor .hljs-string { - color: #9CCC65; -} -.hljs-comment, .hljs-quote { - color: #b18eb1; - font-style: italic; -} -.hljs-doctag, .hljs-formula { - color: #c678dd; -} -.hljs-section, .hljs-name, .hljs-selector-tag, .hljs-deletion, .hljs-subst { - color: #e06c75; -} -.hljs-literal { - color: #56b6c2; -} -.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta-string { - color: #98c379; -} -.hljs-built_in, .hljs-class .hljs-title { - color: #e6c07b; -} -.hljs-attr, .hljs-variable, .hljs-template-variable, .hljs-type, .hljs-selector-class, .hljs-selector-attr, .hljs-selector-pseudo, .hljs-number { - color: #d19a66; -} -.hljs-symbol, .hljs-bullet, .hljs-link, .hljs-meta, .hljs-selector-id, .hljs-title { - color: #61aeee; -} -.hljs-emphasis { - font-style: italic; -} -.hljs-strong { - font-weight: bold; -} -.hljs-link { - text-decoration: underline; -} diff --git a/docs/assets/theme.css b/docs/assets/theme.css deleted file mode 100644 index 687b3347..00000000 --- a/docs/assets/theme.css +++ /dev/null @@ -1,204 +0,0 @@ - -/* ------------------------------------------------------------ */ -/* Overrides for jrnl theme */ -/* ------------------------------------------------------------ */ - -:root { - --sidebar: #604385; - --sidebar-dark: #604385; - --off-white: rgba(255,255,255,.7); -} - -body.wy-body-for-nav, section.wy-nav-content-wrap { - background-color: rgb(252,252,252); -} - -pre { - background-color: transparent; - border: none; - margin: 1em -1em; -} - -pre code { - padding: 1em 1.5em !important; -} - -code { - background-color: transparent; -} - -h1,h2 ,h3, h4, h5, h6 { - font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif; - font-weight: 600; - margin-top: 2rem; - margin-bottom: 0.5rem; -} -p, td, tr, div, li { - font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif; - font-weight: 00; -} - -p { - margin: 1em 0em; -} - -/* No-one likes lines that are 400 characters long. */ -div.rst-content {max-width: 54em;} - -.wy-side-nav-search, .wy-menu-vertical li.current { - background-color: transparent; -} -.wy-nav-top { - background-image: linear-gradient(-211deg, #95699C 0%, #604385 100%); -} - -.wy-nav-top .fa-bars { - line-height: 50px; -} - -.wy-side-nav-search a.icon-home { - width: 100%; - max-width: 250px; - background-size: 100%; -} - -a.icon-home:before { - display: block; - width: 84px; - height: 70px; - content: ""; - background: url(../img/logo_white.svg) center center no-repeat; - margin: 10px auto; -} - -.wy-menu-vertical a, .wy-menu-vertical li ul li a {color: var(--off-white) !important; } - -.wy-menu-vertical a:hover, .wy-menu-vertical li.current a:hover { background-color: transparent !important; color: white !important;} -.wy-menu-vertical li.on a, .wy-menu-vertical li.current>a { - background: transparent; !important; - color: white !important; - border: none; - position: relative; - font-weight: 700 !important; - border-right: none !important; -} - -.wy-menu-vertical li.on a, .wy-menu-vertical li.current a { - border-right: none; -} - -.wy-menu-vertical li.on a, .wy-menu-vertical li.current>a:after { - display: block; - position: absolute; - right: 0em; - top: 0; - z-index: 999 !important; - content: ""; - width: 0; - height: 0; - border-top: 1em solid transparent; - border-bottom: 1em solid transparent; - border-right: 1em solid white; -} - -.rst-versions, .rst-versions .rst-current-version { display: none; } -.wy-menu-vertical span { - color: white !important; - font-size: 1.2em; - font-weight: 300 !important; -} -.wy-menu-vertical li a {color: var(--off-white) !important; font-weight: 300 !important;} - - -.wy-nav-side { - background-image: linear-gradient(211deg, #95699C 0%, #604385 100%); - font-weight: 300 !important; - height: 100%; -} - - -footer {display: none;} - -.wy-side-nav-search input[type=text], form .search-query { - background-color: rgba(0,0,0,.1) !important; - border: 1px solid rgba(255,255,255,.3); - box-shadow: none; - margin-bottom: 1em; - color: white !important; - font-weight: 500; -} - -.wy-side-nav-search input[type=text]::placeholder, form .search-query::placeholder { - color: var(--off-white) !important; -} - -.toctree-l2 a:first-child {display: none;} - -/* ------------------------------------------------------------ */ -/* Logo: ; */ -/* ------------------------------------------------------------ */ - -.logo { - width: 128px; - height: 128px; - vertical-align: middle; - margin-right: 1em; -} - -/* ------------------------------------------------------------ */ -/* Code blocks in callouts */ -/* ------------------------------------------------------------ */ - -div.admonition { - border-radius: 5px; - margin: 1em -1em; -} -div.admonition p.admonition-title { - border-top-left-radius: 5px; - border-top-right-radius: 5px; -} -div.admonition > p { - padding: 0em .5em; -} - - -div.admonition div.highlight { - background: none !important; -} -div.admonition div.highlight pre { - background-color: rgba(255,255,255,.5) !important; -} - -/* ------------------------------------------------------------ */ -/* Fancy ordered lists. */ -/* ------------------------------------------------------------ */ - -ol { - counter-reset:li; - margin-left: 0px; - padding: 0; -} - -ol li { - list-style: none !important; - margin-bottom: 1.5em; - margin-left: 3em !important; -} - -ol > li:before { - content:counter(li); - counter-increment:li; - background-color: var(--sidebar); - border-radius: 50%; - display: block; - float: left; - margin-left: -3em; - margin-top: -.3em; - width: 2em; - height: 2em; - color: var(--sidebar-dark); - text-align: center; - line-height: 2em; - font-weight: 600; -} - diff --git a/docs/formats.md b/docs/formats.md index 5861fd72..93aac9ef 100644 --- a/docs/formats.md +++ b/docs/formats.md @@ -51,7 +51,8 @@ This format is configurable through these values from your config file (see | This is the sample body text of the first sample entry. 2020-07-01 20:00 This is the second sample entry -| This is the sample body text of the second sample entry, but this one has a @tag. +| This is the sample body text of the second sample entry, but +| this one has a @tag. 2020-07-02 09:00 This is the third sample entry | This is the sample body text of the third sample entry. @@ -119,7 +120,7 @@ jrnl --format json JSON is a very handy format used by many programs and has support in nearly every programming language. There are many things you could do with JSON data. Maybe you could -use [`jq`](https://github.com/stedolan/jq) to filter through the fields in your journal. +use `jq` ([project page](https://github.com/stedolan/jq)) to filter through the fields in your journal. Like this: ``` sh diff --git a/docs/installation.md b/docs/installation.md index 278522ec..9912a382 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -22,8 +22,8 @@ should be created and whether you wish to encrypt it. To make a new entry, just type -``` sh -jrnl yesterday: Called in sick. Used the time to clean the house and spent 4h on writing my book. +``` text +jrnl yesterday: Called in sick. Used the time to clean, and spent 4h on writing my book. ``` and hit return. `yesterday:` will be interpreted as a time stamp. diff --git a/docs/theme/img/sprites.svg b/docs/theme/img/sprites.svg deleted file mode 100644 index 32091555..00000000 --- a/docs/theme/img/sprites.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - sprites - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/theme/index.css b/docs/theme/index.css deleted file mode 100644 index a46b95f2..00000000 --- a/docs/theme/index.css +++ /dev/null @@ -1,307 +0,0 @@ -article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0} - -body -{ - background-color: #FAFDFE; - background-color: #f7f8f9; - font-family: "Open Sans", "Helvetica Neue", sans-serif; - font-weight: 300; -} - -.icon { - background-image: url("img/sprites.svg"); - width: 32px; - height: 32px; - display: inline-block; - font-size: 40px; - background-size: 200px 80px; -} - -h3 { font-weight: 400; } - -.icon.secure { - background-position: 0em 0em; -} - -.icon.future { - background-position: -1em 0em; -} - -.icon.search { - background-position: -2em 0em; -} - -.icon.nli { - background-position: -3em 0em; -} - -.icon.share { - background-position: 0em -1em; -} - -.icon.sync { - background-position: 0em -1em; -} - -.icon.dayone { - background-position: -1em -1em; -} - -.icon.github { - background-position: -2em -1em; -} - -.icon.folders { - background-position: -3em -1em; -} - -.icon.twitter { - background-position: -4em -1em; -} - -header { - background-image: linear-gradient(211deg, #95699C 0%, #604385 100%); - color: white; - border: 0px solid transparent; - display: relative; - padding-top: 150px; - overflow: visible; -} - -#terminal { - background: #1B1C2E; - max-width: 520px; - box-shadow: 0 -2px 16px 0 rgba(0,0,0,0.35); - border-radius: 6px; - min-height: 120px; - margin: 0px auto; - position: relative; - transform: translateY(75px); - color: #f7f8f9; - font-family: "Monaco", "Courier New"; - font-size: 12pt; - padding: 45px 20px 0px 20px; - line-height: 165%; -} - -#terminal b { - font-weight: normal; - color: #C2CDD9; -} - -#terminal i { - font-style: normal; - color: #BB97BA; -} - -#terminal:before { - content: ''; - position: absolute; - top: 15px; - left: 15px; - display: inline-block; - width: 15px; - height: 15px; - border-radius: 50%; - background: #3B3B4A; - box-shadow: 25px 0 0 #3B3B4A, 50px 0 0 #3B3B4A; -} - -#typed:before { - content: "$ "; - color: #A879A7; -} - -#twitter { - display: block; - position: absolute; - text-decoration: none; - top: 20px; - right: 20px; - border: 1px solid white; - padding: 5px 10px; - color: white; - border-radius: 3px; - opacity: .7; -} - -#twitter .icon { - transform: scale(.5); - vertical-align: -18%; - margin: 0; - padding: 0; -} - -#twitter:hover, -#twitter:active { - opacity: 1; - text-decoration: none; -} - -#title { - max-width: 630px; - margin: 0 auto; - padding: 0px 20px; -} - -#prompt { - max-width: 700px; - margin: 25px auto 100px auto; - padding: 0px 20px; -} - -header img { - float: left; - margin-right: 30px; -} - -h1 { - color: white; - font-weight: 300; -} - -nav { - text-align: center; -} - -nav a#twitter-nav { - display: none; -} - -a { - color: #684688; - text-decoration: underline; -} - -nav a { - font-size: 14pt; - line-height: 40pt; - margin: 0 40px; -} - -a:hover { - color: #A3629F; -} - -nav a.cta { - display: inline-block; - color: white; - background-image: linear-gradient(259deg, #A3629F 0%, #604385 100%); - box-shadow: 0 2px 8px 0 rgba(0,0,0,0.25); - border-radius: 50px; - padding: 0px 30pt; - white-space: nowrap; - transition: all .1s ease; - font-weight: 600; - text-decoration: none; -} - -nav a.cta:hover { - text-decoration: none; - background-image: linear-gradient(259deg, #AE57A8 0%, #68419C 100%); - box-shadow: 0 4px 16px 0 rgba(0,0,0,0.25); - color: #f7f8f9; -} - -main { - padding: 50px 0 0 0; -} - - -.flex { - display: flex; - margin: 0 auto; - max-width: 920px; - flex-wrap: wrap; - padding: 20px 20px; - justify-content: space-between; - -} - -.flex section { - /*margin: 20px;*/ - margin-top: 40px; - width: 32%; -} - -.flex section:first-child { - margin-left: 0px; -} -.flex section:last-child { - margin-right: 0px; -} - - -.flex section i { - float: left; - left: 0; - display: block; - margin: 0px auto 10px auto; -} - -.flex section h3 { - margin-top: 0; - font-size: 14pt; - color: #684688; - margin-bottom: .5em; - font-weight: 300; - margin-left: 40px; -} - -.flex section p { - padding-left: 40px; - color: #888; - font-size: 12pt; - margin: 0; -} - -footer { - max-width: 700px; - margin: 20px auto; - padding: 0 20px 20px 20px; - font-size: 10pt; - opacity: .5; - text-align: center; -} - -@media screen and (max-width: 680px) { - .flex { - display: block; - padding: 0; - } - .flex section { - width: 100%; - } - - main { - padding: 20px; - margin: 0; - width: calc(100% - 40px); - } - - nav a, - nav a#twitter-nav { - display: inline-block; - margin: 0px 10px; - } - - nav a.cta { - display: block; - margin: 20px; - } - - header #twitter { - display: none; - } - - header #logo { - display: block; - float: none; - margin: 0px auto; - } - - header #title br { - display: none; - } - -} diff --git a/docs/usage.md b/docs/usage.md index df683b0d..f6199751 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -19,7 +19,7 @@ Composing mode is entered by either starting `jrnl` without any arguments -- which will launch an external editor -- or by just writing an entry on the command line: -```sh +```text jrnl today at 3am: I just met Steve Buscemi in a bar! What a nice guy. ``` diff --git a/docs/CNAME b/docs_theme/CNAME similarity index 100% rename from docs/CNAME rename to docs_theme/CNAME diff --git a/docs_theme/assets/colors.css b/docs_theme/assets/colors.css new file mode 100644 index 00000000..331928f9 --- /dev/null +++ b/docs_theme/assets/colors.css @@ -0,0 +1,28 @@ +:root { + /* For dark bg */ + --white: #fcfcfc; + --off-white: #f4f0ff; + --purple: #7e57c2; + --light-purple: #cf93e6; + --blue: #61aeee; + --green: #a6e22e; + --orange: #fd971f; + --red: #eb5567; + --pink: #d57699; + --yellow: #e2b93d; + + /* For light bg */ + --teal: #2a8068; + --dark-blue: #356eb7; + --mid-purple: #92679b; + --bright-purple: #af27ad; + --dark-purple: #604385; + --darkest-purple: #251A32; + --grey: #3b3b4a; + + --black-shadow: #0000001A; + --blacker-shadow: #00000059; + + /* Special cases */ + --terminal: #1b1c2e; +} diff --git a/docs_theme/assets/highlight.css b/docs_theme/assets/highlight.css new file mode 100644 index 00000000..a73ce087 --- /dev/null +++ b/docs_theme/assets/highlight.css @@ -0,0 +1,130 @@ +/* +Atom One Dark With support for ReasonML by Gidi Morris, based off work by +Daniel Gamage + +Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax +*/ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + line-height: 1.3em; + color: var(--off-white); + background: #383e49; + border-radius: 5px; + font-size: 0.9rem; + line-height: 1.3rem; +} +.hljs-keyword, +.hljs-operator { + color: var(--pink); +} +.hljs-pattern-match { + color: var(--pink); +} +.hljs-pattern-match .hljs-constructor { + color: var(--blue); +} +.hljs-function { + color: var(--blue); +} +.hljs-function .hljs-params { + color: var(--green); +} +.hljs-function .hljs-params .hljs-typing { + color: var(--orange); +} +.hljs-module-access .hljs-module { + color: var(--purple); +} +.hljs-constructor { + color: var(--yellow); +} +.hljs-constructor .hljs-string { + color: var(--green); +} +.hljs-comment, +.hljs-quote { + color: var(--light-purple); + font-style: italic; +} +.hljs-doctag, +.hljs-formula { + color: var(--purple); +} +.hljs-section, +.hljs-name, +.hljs-selector-tag, +.hljs-deletion, +.hljs-subst { + color: var(--yellow); +} +.hljs-literal { + color: var(--blue); +} +.hljs-string, +.hljs-regexp, +.hljs-addition, +.hljs-attribute, +.hljs-meta-string { + color: var(--green); +} +.hljs-built_in, +.hljs-class .hljs-title { + color: var(--orange); +} +.hljs-attr, +.hljs-variable, +.hljs-template-variable, +.hljs-type, +.hljs-selector-class, +.hljs-selector-attr, +.hljs-selector-pseudo, +.hljs-number { + color: var(--orange); +} + +.rst-content a tt, +.rst-content a tt, +.rst-content a code { + color: var(--blue); +} + +.hljs-number, +.hljs-literal, +.hljs-variable, +.hljs-template-variable, +.hljs-tag .hljs-attr { + color: var(--blue); +} + +.hljs-tag { + color: var(--pink) +} + +.hljs-symbol, +.hljs-bullet, +.hljs-link, +.hljs-meta, +.hljs-selector-id, +.hljs-title { + color: var(--blue); +} +.hljs-emphasis { + font-style: italic; +} +.hljs-strong { + font-weight: bold; +} +.hljs-link { + text-decoration: underline; +} + +.rst-content .note .admonition-title { + background: var(--dark-blue); +} + +.rst-content .tip .admonition-title { + background: var(--teal); +} diff --git a/docs_theme/assets/index.css b/docs_theme/assets/index.css new file mode 100644 index 00000000..e08cab71 --- /dev/null +++ b/docs_theme/assets/index.css @@ -0,0 +1,317 @@ +/* reset */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0} + +body { + background-color: var(--white); + font-family: "Open Sans", "Helvetica Neue", sans-serif; + font-weight: 300; +} + +.icon { + background-image: url("img/sprites.svg"); + width: 32px; + height: 32px; + display: inline-block; + font-size: 40px; + background-size: 200px 80px; +} + +h3 { + font-weight: 400; +} + +.icon.secure { + background-position: 0em 0em; +} + +.icon.future { + background-position: -1em 0em; +} + +.icon.search { + background-position: -2em 0em; +} + +.icon.nli { + background-position: -3em 0em; +} + +.icon.share { + background-position: 0em -1em; +} + +.icon.sync { + background-position: 0 -1em; +} + +.icon.dayone { + background-position: -1em -1em; +} + +.icon.github { + background-position: -2em -1em; +} + +.icon.search { + background-position: -2em 0; +} + +.icon.folders { + background-position: -3em -1em; +} + +.icon.twitter { + background-position: -4em -1em; +} + +header { + background-image: linear-gradient(211deg, var(--mid-purple) 0%, var(--dark-purple) 100%); + color: var(--white); + border: 0px solid transparent; + display: relative; + padding-top: 150px; + overflow: visible; +} + +#terminal { + background: var(--terminal); + max-width: 520px; + box-shadow: 0 -2px 16px 0 var(--black-shadow); + border-radius: 6px; + min-height: 120px; + margin: 0px auto; + position: relative; + transform: translateY(75px); + color: var(--off-white); + font-family: "Monaco", "Courier New"; + font-size: 18px; + padding: 45px 20px 0px 20px; + line-height: 165%; +} + +#terminal b { + font-weight: normal; + color: var(--off-white); +} + +#terminal i { + font-style: normal; + color: var(--light-purple); +} + +#terminal:before { + content: ""; + position: absolute; + top: 15px; + left: 15px; + display: inline-block; + width: 15px; + height: 15px; + border-radius: 50%; + background: var(--grey); + box-shadow: 25px 0 0 var(--grey), 50px 0 0 var(--grey); +} + +#typed:before { + content: "$ "; + color: var(--mid-purple); +} + +#twitter { + display: block; + position: absolute; + text-decoration: none; + top: 20px; + right: 20px; + border: 1px solid var(--white); + padding: 5px 10px; + color: var(--white); + border-radius: 3px; +} + +#twitter .icon { + transform: scale(0.5); + vertical-align: -18%; + margin: 0; + padding: 0; +} + +#twitter:hover, +#twitter:active { + text-decoration: none; + box-shadow: 0 2px 25px 0 var(--black-shadow); + transition: all .5s ease; +} + +#title { + max-width: 630px; + margin: 0 auto; + padding: 0px 20px; +} + +#prompt { + max-width: 700px; + margin: 25px auto 100px auto; + padding: 0px 20px; +} + +header img { + float: left; + margin-right: 30px; +} + +h1 { + color: var(--white); + font-weight: 300; +} + +a, +a:visited { + color: var(--dark-purple); +} + +a:hover { + color: var(--bright-purple); +} + +nav { + text-align: center; +} + +nav a#twitter-nav { + display: none; +} + +nav a, nav a:visited { + color: var(--dark-purple); + font-size: 20px; + line-height: 2.5em; + margin: 0 40px; + font-weight: 400; + text-decoration: none; +} + +nav a:hover, +nav a:visited:hover { + color: var(--bright-purple); + text-decoration: underline; +} + + +nav a.cta { + display: inline-block; + color: var(--white); + background-image: linear-gradient(259deg, var(--mid-purple) 0%, var(--dark-purple) 100%); + box-shadow: 0 2px 8px 0 var(--blacker-shadow); + border-radius: 50px; + padding: 0 2em; + white-space: nowrap; + transition: all 0.1s ease; + text-decoration: none; +} + +nav a.cta:hover { + text-decoration: none; + background-image: linear-gradient(259deg, var(--bright-purple) 0%, var(--dark-purple) 100%); + box-shadow: 0 4px 16px 0 var(--black-shadow); + color: var(--off-white); +} + +main { + padding: 60px 0 0 0; +} + +.flex { + display: flex; + margin: 0 auto; + max-width: 920px; + flex-wrap: wrap; + padding: 20px 20px; + padding-top: 30px; + justify-content: space-between; +} + +.flex section { + /*margin: 20px;*/ + margin-top: 40px; + width: 32%; +} + +.flex section:first-child { + margin-left: 0px; +} +.flex section:last-child { + margin-right: 0px; +} + +.flex section i { + float: left; + left: 0; + display: block; + margin: 0px auto 10px auto; +} + +.flex section h3 { + margin-top: 0; + font-size: 18px; + color: var(--dark-purple); + margin-bottom: 0.5em; + font-weight: 300; + margin-left: 40px; +} + +.flex section p { + padding-left: 40px; + color: var(--grey); + font-size: 16px; + margin: 0; +} + +footer { + color: var(--grey); + max-width: 700px; + margin: 70px auto 20px; + padding: 0 20px 20px 20px; + font-size: 16px; + text-align: center; +} + +@media screen and (max-width: 680px) { + .flex { + display: block; + padding: 0; + } + .flex section { + width: 100%; + } + + main { + padding: 20px; + margin: 0; + width: calc(100% - 40px); + } + + nav a, + nav a#twitter-nav { + display: inline-block; + margin: 0px 10px; + } + + nav a.cta { + display: block; + margin: 20px; + } + + header #twitter { + display: none; + } + + header #logo { + display: block; + float: none; + margin: 0px auto; + } + + header #title br { + display: none; + } +} diff --git a/docs/assets/readme-header.png b/docs_theme/assets/readme-header.png similarity index 100% rename from docs/assets/readme-header.png rename to docs_theme/assets/readme-header.png diff --git a/docs_theme/assets/theme.css b/docs_theme/assets/theme.css new file mode 100644 index 00000000..f394d6d3 --- /dev/null +++ b/docs_theme/assets/theme.css @@ -0,0 +1,311 @@ +/* ------------------------------------------------------------ */ +/* Overrides for jrnl theme */ +/* ------------------------------------------------------------ */ + +body.wy-body-for-nav, +section.wy-nav-content-wrap { + background-color: var(--white); +} + +.rst-content pre { + background-color: transparent; + border: none; + margin: 1em -1em; +} + +.rst-content code { + color: var(--darkest-purple); + background-color: var(--off-white); + font-size: 15px; +} + +.rst-content pre code { + color: var(--off-white); + background: var(--darkest-purple); + padding: 1em 1.5em; + border-radius: 15px; + border: none; + font-size: 16px; + line-height: 1.5em; + font-weight: 200 !important; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif; + font-weight: 600; + margin-top: 2rem; + margin-bottom: 0.2rem; +} + +h2 { + font-size: 1.2em; + margin-top: 40px; +} + +p, +td, +tr, +div, +li { + font-family: "Open Sans", "Helvetica Neue", Helvetica, sans-serif; + font-weight: 00; + font-size: 18px; + line-height: 1.5em; +} + +p { + margin: 1em 0em; +} + +/* No-one likes lines that are 400 characters long. */ +div.rst-content { + max-width: 54em; +} + +.wy-side-nav-search, +.wy-menu-vertical li.current { + background-color: transparent; +} + +.wy-nav-top { + background-image: linear-gradient(-211deg, var(--light-purple) 0%, var(--dark-purple) 100%); +} + +.wy-nav-top .fa-bars { + line-height: 50px; +} + +.wy-side-nav-search a.icon-home { + width: 100%; + max-width: 250px; + background-size: 100%; +} + +a.icon-home:before { + display: block; + width: 84px; + height: 70px; + content: ""; + background: url(../img/logo_white.svg) center center no-repeat; + margin: 10px auto; +} + +.wy-menu-vertical a, +.wy-menu-vertical li ul li a { + font-size: 16px; + color: var(--off-white); + line-height: 2em; +} + +.wy-menu-vertical a:hover { + background-color: var(--black-shadow); + color: var(--white); +} + +.wy-menu-vertical li.on a { + transition: all .25s ease; + background: var(--dark-purple); + color: var(--white); + position: relative; +} + +.wy-menu-vertical li.current>a { + background: var(--darkest-purple); + border: none !important; +} + +.wy-menu-vertical li.current>a:hover { + background: var(--darkest-purple); + border: none; +} + +.wy-menu-vertical li.on a, +.wy-menu-vertical li.current a { + border-right: none; +} + +.wy-menu-vertical li.on a, +.wy-menu-vertical li.current>a:after { + position: absolute; + right: 0em; + z-index: 999; + content: ""; + width: 0; + height: 0; + border-top: 1em solid transparent; + border-bottom: 1em solid transparent; + border-right: 1em solid var(--white); +} +.wy-menu-vertical li li.toctree-l2 { + font-weight: 800 !important; + font-size: 50px; + color: red !important; +} + +.toctree-expand:before { + display: none !important; +} + +.rst-versions, +.rst-versions .rst-current-version { + display: none; +} + +.wy-menu-vertical span { + color: var(--white); + font-size: 1.2em; + font-weight: 300; +} + +.wy-menu-vertical li a { + color: var(--off-white) !important; + font-weight: 300; +} + + +.wy-nav-side { + background-image: linear-gradient(211deg, var(--mid-purple) 0%, var(--dark-purple) 100%); + font-weight: 300; + height: 100%; +} + + +footer { + display: none; +} + +.wy-side-nav-search input[type=text], +form .search-query { + background-color: var(--black-shadow) !important; + border: none; + box-shadow: none; + margin-bottom: 1em; + color: var(--white); + font-weight: 500; +} + +.wy-side-nav-search input[type=text]::placeholder, +form .search-query::placeholder { + color: var(--off-white); +} + +.wy-side-nav-search > a:hover { + background: transparent; +} + +.toctree-l2 a:first-child { + display: none; +} + +/* ------------------------------------------------------------ */ +/* Logo: ; */ +/* ------------------------------------------------------------ */ + +.logo { + width: 128px; + height: 128px; + vertical-align: middle; + margin-right: 1em; +} + +/* ------------------------------------------------------------ */ +/* Code blocks in callouts */ +/* ------------------------------------------------------------ */ + +div.admonition { + border-radius: 5px; + margin: 1em -1em; +} + +div.admonition p.admonition-title { + border-top-left-radius: 5px; + border-top-right-radius: 5px; +} + +div.admonition>p { + padding: 0em .5em; +} + + +div.admonition div.highlight { + background: none !important; +} + +/* ------------------------------------------------------------ */ +/* Fancy ordered lists. */ +/* ------------------------------------------------------------ */ + +ol { + counter-reset: li; + margin-left: 0px; + padding: 0; +} + +ol li { + list-style: none !important; + margin-bottom: 1.5em; + margin-left: 3em !important; +} + +ol>li:before { + content: counter(li); + counter-increment: li; + background-color: var(--sidebar); + border-radius: 50%; + display: block; + float: left; + margin-left: -3em; + margin-top: -.3em; + width: 2em; + height: 2em; + color: var(--dark-purple); + text-align: center; + line-height: 2em; + font-weight: 600; +} + + +/* ------------------------------------------------------------ */ +/* Accessibility-related changes */ +/* ------------------------------------------------------------ */ +.rst-content div[role="main"] a, +.rst-content div[role="main"] a:visited { + color: var(--mid-purple); + text-decoration: underline; +} + +.rst-content div[role="main"] a:hover { + color: var(--bright-purple); +} + +.rst-content div[role="navigation"] a, +.rst-content div[role="navigation"] a:visited { + color: var(--mid-purple); +} + +.mkdocs-search { + display: flex; + margin-top: 20px; +} + +.wy-side-nav-search input[type="text"] { + border-radius: 50px 0 0 50px; + height: 32px; + border-right: none; +} + +.mkdocs-search button { + background-color: var(--black-shadow); + border: none; + box-shadow: none; + color: var(--white); + border-radius: 0 50px 50px 0; + height: 32px; + width: 2.5em; + overflow: hidden; +} diff --git a/docs/theme/img/banner_og.png b/docs_theme/img/banner_og.png similarity index 100% rename from docs/theme/img/banner_og.png rename to docs_theme/img/banner_og.png diff --git a/docs/theme/img/banner_twitter.png b/docs_theme/img/banner_twitter.png similarity index 100% rename from docs/theme/img/banner_twitter.png rename to docs_theme/img/banner_twitter.png diff --git a/docs/theme/img/favicon.ico b/docs_theme/img/favicon.ico similarity index 100% rename from docs/theme/img/favicon.ico rename to docs_theme/img/favicon.ico diff --git a/docs/theme/img/favicon.svg b/docs_theme/img/favicon.svg similarity index 100% rename from docs/theme/img/favicon.svg rename to docs_theme/img/favicon.svg diff --git a/docs/theme/img/jrnl_white.svg b/docs_theme/img/jrnl_white.svg similarity index 100% rename from docs/theme/img/jrnl_white.svg rename to docs_theme/img/jrnl_white.svg diff --git a/docs/theme/img/logo.svg b/docs_theme/img/logo.svg similarity index 100% rename from docs/theme/img/logo.svg rename to docs_theme/img/logo.svg diff --git a/docs/theme/img/logo_white.svg b/docs_theme/img/logo_white.svg similarity index 100% rename from docs/theme/img/logo_white.svg rename to docs_theme/img/logo_white.svg diff --git a/docs_theme/img/sprites.svg b/docs_theme/img/sprites.svg new file mode 100644 index 00000000..e9d1d1d6 --- /dev/null +++ b/docs_theme/img/sprites.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/theme/index.html b/docs_theme/index.html similarity index 95% rename from docs/theme/index.html rename to docs_theme/index.html index aaeaf44e..2570a75c 100755 --- a/docs/theme/index.html +++ b/docs_theme/index.html @@ -1,5 +1,5 @@ - + @@ -22,7 +22,8 @@ - + + @@ -45,7 +46,7 @@ Tell your friends
- +

Collect your thoughts and notes
without leaving the command line.

@@ -57,9 +58,9 @@
diff --git a/docs/theme/index.js b/docs_theme/index.js similarity index 100% rename from docs/theme/index.js rename to docs_theme/index.js diff --git a/docs_theme/main.html b/docs_theme/main.html new file mode 100644 index 00000000..4291adce --- /dev/null +++ b/docs_theme/main.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block search_button %} +
+ + +
+{% endblock %} diff --git a/docs/requirements.txt b/docs_theme/requirements.txt similarity index 100% rename from docs/requirements.txt rename to docs_theme/requirements.txt diff --git a/mkdocs.yml b/mkdocs.yml index 66a4f9d5..c70d3807 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,11 +2,12 @@ site_name: jrnl site_url: https://jrnl.sh theme: name: readthedocs - custom_dir: docs/theme + custom_dir: docs_theme static_templates: - index.html extra_css: - https://fonts.googleapis.com/css?family=Open+Sans:300,600 + - assets/colors.css - assets/theme.css - assets/highlight.css markdown_extensions: diff --git a/readthedocs.yml b/readthedocs.yml index dabbddc7..f74f3d23 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -19,4 +19,4 @@ formats: python: version: 3.7 install: - - requirements: docs/requirements.txt + - requirements: docs_theme/requirements.txt From b1f936e65c379f1d0a13c89c51bf96a793d8fa24 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 12 Dec 2020 20:06:56 +0000 Subject: [PATCH 03/38] Update changelog [ci skip] --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41c7568f..ba7c8247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,19 @@ [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5.1-alpha...HEAD) +**Implemented enhancements:** + +- Low Contrast Text on Webpage [\#1061](https://github.com/jrnl-org/jrnl/issues/1061) + **Fixed bugs:** - Missing readline module can be dealt with more gracefully [\#1015](https://github.com/jrnl-org/jrnl/issues/1015) - Check for readline module instead of Windows when initializing autocomplete in install [\#1104](https://github.com/jrnl-org/jrnl/pull/1104) +**Documentation:** + +- Make docs site \(jrnl.sh\) fully meet Web Content Accessibility Guidelines \(WCAG\) 2.1 [\#1105](https://github.com/jrnl-org/jrnl/pull/1105) + ## [v2.5.1-alpha](https://pypi.org/project/jrnl/v2.5.1-alpha/) (2020-11-28) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5...v2.5.1-alpha) From ae6041a010f45b471679e05caddace8afb9f2090 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 12 Dec 2020 12:33:40 -0800 Subject: [PATCH 04/38] fix readme header (#1108) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da42eb2d..6868c61c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- +

From eddf37a1b575f9b1bcb4feae5d2af55bce922749 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 12 Dec 2020 12:41:49 -0800 Subject: [PATCH 05/38] Fix readme links (#1109) * fix links to docs now that we use readthedocs * fix badge links in readme --- .github/ISSUE_TEMPLATE/documentation.md | 2 +- README.md | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md index 47c8410b..24aacdd3 100644 --- a/.github/ISSUE_TEMPLATE/documentation.md +++ b/.github/ISSUE_TEMPLATE/documentation.md @@ -18,7 +18,7 @@ Please fill out the points below, as it will make our process much easier. Please tell us which page, or pages, from the documentation site (https://jrnl.sh) are affected in this issue --> - - + - ### What Could Be Better? # Contributing We welcome contributions to jrnl, whether it's through reporting bugs, improving the documentation, testing releases, engaging in discussion on features and bugs, or writing code. diff --git a/docs/advanced.md b/docs/advanced.md index 3a0172e7..51c4d1af 100644 --- a/docs/advanced.md +++ b/docs/advanced.md @@ -1,3 +1,5 @@ + # Advanced Usage ## Configuration File diff --git a/docs/encryption.md b/docs/encryption.md index 6b966aa3..ae1af43f 100644 --- a/docs/encryption.md +++ b/docs/encryption.md @@ -1,3 +1,5 @@ + # Encryption ## A Note on Security diff --git a/docs/formats.md b/docs/formats.md index 93aac9ef..99b3e69b 100644 --- a/docs/formats.md +++ b/docs/formats.md @@ -1,3 +1,5 @@ + # Formats `jrnl` supports a variety of alternate formats. These can be used to display your diff --git a/docs/installation.md b/docs/installation.md index 9912a382..ee70893a 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -1,3 +1,5 @@ + # Getting started ## Installation diff --git a/docs/overview.md b/docs/overview.md index fdfb2159..57269585 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -1,3 +1,5 @@ + # Overview `jrnl` is a simple journal application for the command line. diff --git a/docs/privacy-and-security.md b/docs/privacy-and-security.md index b93e99a1..39f4863c 100644 --- a/docs/privacy-and-security.md +++ b/docs/privacy-and-security.md @@ -1,3 +1,5 @@ + # Privacy and Security `jrnl` is designed with privacy and security in mind, but like any other diff --git a/docs/recipes.md b/docs/recipes.md index a80a0c09..b7d370a4 100644 --- a/docs/recipes.md +++ b/docs/recipes.md @@ -1,3 +1,5 @@ + # FAQ ## Recipes diff --git a/docs/usage.md b/docs/usage.md index ab7e143f..6d5cd765 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -1,3 +1,5 @@ + # Basic Usage # `jrnl` has two modes: **composing** and **viewing**. Whenever you don't enter diff --git a/docs_theme/assets/colors.css b/docs_theme/assets/colors.css index c8280af3..1a518461 100644 --- a/docs_theme/assets/colors.css +++ b/docs_theme/assets/colors.css @@ -1,3 +1,6 @@ +/* Copyright (C) 2012-2021 jrnl contributors + License: https://www.gnu.org/licenses/gpl-3.0.html */ + :root { /* For dark bg */ --white: #fcfcfc; diff --git a/docs_theme/assets/index.css b/docs_theme/assets/index.css index b447dec6..6a05be25 100644 --- a/docs_theme/assets/index.css +++ b/docs_theme/assets/index.css @@ -1,3 +1,5 @@ +/* Copyright (C) 2012-2021 jrnl contributors + License: https://www.gnu.org/licenses/gpl-3.0.html */ /* reset */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0} body { diff --git a/docs_theme/assets/theme.css b/docs_theme/assets/theme.css index f394d6d3..9c78ded8 100644 --- a/docs_theme/assets/theme.css +++ b/docs_theme/assets/theme.css @@ -1,3 +1,6 @@ +/* Copyright (C) 2012-2021 jrnl contributors + License: https://www.gnu.org/licenses/gpl-3.0.html */ + /* ------------------------------------------------------------ */ /* Overrides for jrnl theme */ /* ------------------------------------------------------------ */ diff --git a/docs_theme/index.html b/docs_theme/index.html index 2570a75c..491da4c7 100755 --- a/docs_theme/index.html +++ b/docs_theme/index.html @@ -1,3 +1,5 @@ + diff --git a/features/core.feature b/features/core.feature index 0861f231..26640c00 100644 --- a/features/core.feature +++ b/features/core.feature @@ -4,13 +4,13 @@ Feature: Functionality of jrnl outside of actually handling journals Given we use the config "simple.yaml" When we run "jrnl --version" Then we should get no error - Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$" + Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?" Scenario: Displaying the version number Given we use the config "simple.yaml" When we run "jrnl -v" Then we should get no error - Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$" + Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?" Scenario: Running the diagnostic command When we run "jrnl --diagnostic" diff --git a/features/steps/core.py b/features/steps/core.py index 58c0a71d..d579b6d2 100644 --- a/features/steps/core.py +++ b/features/steps/core.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import ast from collections import defaultdict import os diff --git a/features/steps/export_steps.py b/features/steps/export_steps.py index d7173ace..6a5c8e46 100644 --- a/features/steps/export_steps.py +++ b/features/steps/export_steps.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import json import os import shutil diff --git a/jrnl/Entry.py b/jrnl/Entry.py index 0ca6c3b5..2a85e015 100755 --- a/jrnl/Entry.py +++ b/jrnl/Entry.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + from datetime import datetime import re diff --git a/jrnl/FolderJournal.py b/jrnl/FolderJournal.py index 9a6ea3c0..e727cdf0 100644 --- a/jrnl/FolderJournal.py +++ b/jrnl/FolderJournal.py @@ -1,5 +1,8 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import codecs import fnmatch diff --git a/jrnl/Journal.py b/jrnl/Journal.py index dc6292b7..1871e3c2 100644 --- a/jrnl/Journal.py +++ b/jrnl/Journal.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + from datetime import datetime import logging diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 8b0c4181..8f4dc3ec 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html try: from .__version__ import __version__ diff --git a/jrnl/__main__.py b/jrnl/__main__.py index a67d0add..e977369f 100644 --- a/jrnl/__main__.py +++ b/jrnl/__main__.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import sys from .cli import cli diff --git a/jrnl/__version__.py b/jrnl/__version__.py index 74135de9..68cf1775 100644 --- a/jrnl/__version__.py +++ b/jrnl/__version__.py @@ -1 +1,4 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + __version__ = "v2.6-beta" diff --git a/jrnl/args.py b/jrnl/args.py index 0ba55961..5efb00ba 100644 --- a/jrnl/args.py +++ b/jrnl/args.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import argparse import re import textwrap diff --git a/jrnl/cli.py b/jrnl/cli.py index 47b7c303..e010f38e 100644 --- a/jrnl/cli.py +++ b/jrnl/cli.py @@ -1,21 +1,7 @@ #!/usr/bin/env python -""" - jrnl +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html - license: GPLv3, see LICENSE.md for more details. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -""" import logging import sys diff --git a/jrnl/commands.py b/jrnl/commands.py index d8d36571..8473954e 100644 --- a/jrnl/commands.py +++ b/jrnl/commands.py @@ -29,7 +29,13 @@ def preconfig_version(_): from jrnl import __title__ from jrnl import __version__ - version_str = f"{__title__} version {__version__}" + version_str = f"""{__title__} version {__version__} + +Copyright (C) 2012-2021 jrnl contributors + +This is free software, and you are welcome to redistribute it under certain +conditions; for details, see: https://www.gnu.org/licenses/gpl-3.0.html""" + print(version_str) diff --git a/jrnl/exception.py b/jrnl/exception.py index 9ed93e25..f1a509f5 100644 --- a/jrnl/exception.py +++ b/jrnl/exception.py @@ -1,3 +1,7 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + + class UserAbort(Exception): pass diff --git a/jrnl/install.py b/jrnl/install.py index 9dff5a1a..a5023815 100644 --- a/jrnl/install.py +++ b/jrnl/install.py @@ -1,4 +1,7 @@ #!/usr/bin/env python +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import glob import logging diff --git a/jrnl/jrnl.py b/jrnl/jrnl.py index ccbca33e..ad5b07d0 100644 --- a/jrnl/jrnl.py +++ b/jrnl/jrnl.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import logging import sys diff --git a/jrnl/os_compat.py b/jrnl/os_compat.py index 33fd47e1..b38d9d60 100644 --- a/jrnl/os_compat.py +++ b/jrnl/os_compat.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + from sys import platform on_windows = "win32" in platform diff --git a/jrnl/output.py b/jrnl/output.py index 624dd8be..43390346 100644 --- a/jrnl/output.py +++ b/jrnl/output.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import logging diff --git a/jrnl/plugins/__init__.py b/jrnl/plugins/__init__.py index 9fcafca2..0d2b39b4 100644 --- a/jrnl/plugins/__init__.py +++ b/jrnl/plugins/__init__.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html from .fancy_exporter import FancyExporter from .jrnl_importer import JRNLImporter diff --git a/jrnl/plugins/fancy_exporter.py b/jrnl/plugins/fancy_exporter.py index 7e3358d5..74cc6958 100644 --- a/jrnl/plugins/fancy_exporter.py +++ b/jrnl/plugins/fancy_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html from textwrap import TextWrapper diff --git a/jrnl/plugins/jrnl_importer.py b/jrnl/plugins/jrnl_importer.py index 9ea9ee26..af5ea6ce 100644 --- a/jrnl/plugins/jrnl_importer.py +++ b/jrnl/plugins/jrnl_importer.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html import sys diff --git a/jrnl/plugins/json_exporter.py b/jrnl/plugins/json_exporter.py index 9254e51a..dd07b0ce 100644 --- a/jrnl/plugins/json_exporter.py +++ b/jrnl/plugins/json_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html import json diff --git a/jrnl/plugins/markdown_exporter.py b/jrnl/plugins/markdown_exporter.py index 7ee20472..693f2fa5 100644 --- a/jrnl/plugins/markdown_exporter.py +++ b/jrnl/plugins/markdown_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html import os import re diff --git a/jrnl/plugins/tag_exporter.py b/jrnl/plugins/tag_exporter.py index 89d54a1a..bc3736eb 100644 --- a/jrnl/plugins/tag_exporter.py +++ b/jrnl/plugins/tag_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html from .text_exporter import TextExporter from .util import get_tags_count diff --git a/jrnl/plugins/template.py b/jrnl/plugins/template.py index d08ae6e8..147cd7af 100644 --- a/jrnl/plugins/template.py +++ b/jrnl/plugins/template.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import re import yaml diff --git a/jrnl/plugins/template_exporter.py b/jrnl/plugins/template_exporter.py index f8d704ef..af081f8c 100644 --- a/jrnl/plugins/template_exporter.py +++ b/jrnl/plugins/template_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html from glob import glob import os diff --git a/jrnl/plugins/text_exporter.py b/jrnl/plugins/text_exporter.py index ebe50016..7714606c 100644 --- a/jrnl/plugins/text_exporter.py +++ b/jrnl/plugins/text_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html import os import re diff --git a/jrnl/plugins/util.py b/jrnl/plugins/util.py index a030f8d3..04159ca4 100644 --- a/jrnl/plugins/util.py +++ b/jrnl/plugins/util.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html def get_tags_count(journal): diff --git a/jrnl/plugins/xml_exporter.py b/jrnl/plugins/xml_exporter.py index 4ffcc731..b9467912 100644 --- a/jrnl/plugins/xml_exporter.py +++ b/jrnl/plugins/xml_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html from xml.dom import minidom diff --git a/jrnl/plugins/yaml_exporter.py b/jrnl/plugins/yaml_exporter.py index 0d431967..df3b0548 100644 --- a/jrnl/plugins/yaml_exporter.py +++ b/jrnl/plugins/yaml_exporter.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # encoding: utf-8 +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html import os import re diff --git a/jrnl/prompt.py b/jrnl/prompt.py index 13828620..3cdd3f6f 100644 --- a/jrnl/prompt.py +++ b/jrnl/prompt.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import getpass import sys diff --git a/jrnl/time.py b/jrnl/time.py index 45fc15cc..b9ea8e84 100644 --- a/jrnl/time.py +++ b/jrnl/time.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + from datetime import datetime FAKE_YEAR = 9999 diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index fb526e97..158f8de3 100644 --- a/jrnl/upgrade.py +++ b/jrnl/upgrade.py @@ -1,3 +1,6 @@ +# Copyright (C) 2012-2021 jrnl contributors +# License: https://www.gnu.org/licenses/gpl-3.0.html + import os import sys diff --git a/mkdocs.yml b/mkdocs.yml index c70d3807..65a515da 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -14,7 +14,7 @@ markdown_extensions: - admonition repo_url: https://github.com/jrnl-org/jrnl/ edit_uri: edit/develop/docs/ -site_author: Manuel Ebert +site_author: jrnl contributors site_description: Collect your thoughts and notes without leaving the command line. nav: - Overview: overview.md diff --git a/pyproject.toml b/pyproject.toml index 9893cebd..9a082829 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,6 +3,7 @@ name = "jrnl" version = "v2.6-beta" description = "Collect your thoughts and notes without leaving the command line." authors = [ + "jrnl contributors ", "Manuel Ebert ", "Jonathan Wren ", "Micah Ellison " From 3dec22651eef4249d963629155ac7b389fa487b1 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 19 Dec 2020 22:54:47 +0000 Subject: [PATCH 22/38] Update changelog [ci skip] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a137c3a7..ae8e2c8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ **Documentation:** - Small accessibility fixes for docs site [\#1122](https://github.com/jrnl-org/jrnl/pull/1122) +- Comply with GPL by acknowledging all authors and including license info in each source file [\#1121](https://github.com/jrnl-org/jrnl/pull/1121) - Fix lone closing parenthesis [\#1118](https://github.com/jrnl-org/jrnl/pull/1118) ## [v2.6-beta](https://pypi.org/project/jrnl/v2.6-beta/) (2020-12-12) From 2e9e857b7b68a3f5e9b07102e7b243b15428a0ca Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Dec 2020 15:07:45 -0800 Subject: [PATCH 23/38] standardize version regex in release pipeline (#1124) --- .github/workflows/changelog.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index 471acb79..ffacd90e 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -35,7 +35,7 @@ jobs: if [[ $GITHUB_REF =~ ^refs/tags/ ]]; then # This is a tag build (i.e. a release) echo '::debug::Release build' - if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then + if [[ ! $BRANCH =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then echo "::error::Invalid tag format: ${BRANCH}" exit 1 fi diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 67d70065..b8474967 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: version: - description: 'Version (e.g. v2.5 or v2.5.1-beta)' + description: 'Version (e.g. v2.5, v2.5.1-beta, v2.6-beta2)' required: true jobs: @@ -15,7 +15,7 @@ jobs: run: | JRNL_VERSION="${{ github.event.inputs.version }}" echo "::debug::version: $JRNL_VERSION" - if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)(\.[0-9]+)?)?$ ]]; then + if [[ ! $JRNL_VERSION =~ ^v[0-9]+(\.[0-9]+){1,2}(-(alpha|beta)([0-9]+)?)?$ ]]; then echo echo "::error::Bad version" echo From 68cf2d773d53030328c6c9ed0260475e4b7ca10a Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Dec 2020 16:36:25 -0800 Subject: [PATCH 24/38] do additional check for json data, and retry for 5-ish minutes on failure (#1125) --- .github/workflows/release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b8474967..c959d810 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -162,7 +162,15 @@ jobs: run: brew install pipgrip - name: Query PyPI API - run: curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json + uses: nick-invision/retry@v2 + with: + timeout_seconds: 10 + max_attempts: 30 + retry_wait_seconds: 10 + command: | + curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json + # if query doesn't have our version yet, give it some time before trying again + [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]] && exit 1 - name: Update Homebrew Formula run: > From e1cbce8a08718375d03f7b3784375347960c1641 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 19 Dec 2020 16:56:23 -0800 Subject: [PATCH 25/38] add more debug data to changelog workflow, update changelog --- .github/workflows/changelog.yaml | 4 ++-- .github/workflows/release.yaml | 34 ++++++++++++++++++++++---------- CHANGELOG.md | 4 ++-- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index ffacd90e..62cf0408 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -56,7 +56,7 @@ jobs: if [[ "$(git rev-parse "origin/$BRANCH")" != $GITHUB_SHA ]]; then # Normal build on a branch (no tag) - echo "::debug::BRANCH: $BRANCH" + echo "::debug::BRANCH: $BRANCH $(git rev-parse origin/$BRANCH)" echo "::debug::GITHUB_SHA: $GITHUB_SHA" echo "::error::$BRANCH has been updated since build started. Aborting changelog." exit 1 @@ -130,7 +130,7 @@ jobs: echo "SOMETHING_CHANGED=$SOMETHING_CHANGED" >> $GITHUB_ENV - name: Commit - if: env.SOMETHING_CHANGED + if: env.SOMETHING_CHANGED == 'true' run: | git config user.email "jrnl.bot@gmail.com" git config user.name "Jrnl Bot" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c959d810..884a8c48 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -75,6 +75,7 @@ jobs: git add pyproject.toml jrnl/__version__.py git commit -m "Increment version to ${JRNL_VERSION}" git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION" + git push git push --tags - name: Build @@ -170,18 +171,31 @@ jobs: command: | curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json # if query doesn't have our version yet, give it some time before trying again - [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]] && exit 1 + if [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]]; then + echo "::debug::PYPI_VERSION: $PYPI_VERSION" + echo "::debug::JQ VALUE: $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" + echo "::group::cat api_response.json" + cat api_response.json + echo "::endgroup::" + exit 1 + fi - name: Update Homebrew Formula - run: > - brew bump-formula-pr "Formula/${FORMULA_NAME}.rb" - --url $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json) - --sha256 $(jq ".releases[\"${PYPI_VERSION}\"][1].digests.sha256" -r api_response.json) - --version=$PYPI_VERSION - --no-audit - --write - --commit - --force + uses: nick-invision/retry@v2 + with: + timeout_minutes: 8 + max_attempts: 6 + retry_wait_seconds: 30 + command: > + brew bump-formula-pr "Formula/${FORMULA_NAME}.rb" + --url $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json) + --sha256 $(jq ".releases[\"${PYPI_VERSION}\"][1].digests.sha256" -r api_response.json) + --version=$PYPI_VERSION + --no-audit + --write + --commit + --force + --verbose - name: Update commit message run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8e2c8b..085ac509 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## [Unreleased](https://github.com/jrnl-org/jrnl/) +## [v2.6-beta3](https://pypi.org/project/jrnl/v2.6-beta3/) (2020-12-19) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...HEAD) +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...v2.6-beta3) **Fixed bugs:** From 7cf977a3cb68b2b0add8dc87a630f5b21c6cb3b7 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sun, 20 Dec 2020 02:24:38 +0000 Subject: [PATCH 26/38] Increment version to v2.6-beta5 --- jrnl/__version__.py | 5 +---- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jrnl/__version__.py b/jrnl/__version__.py index 68cf1775..2765f166 100644 --- a/jrnl/__version__.py +++ b/jrnl/__version__.py @@ -1,4 +1 @@ -# Copyright (C) 2012-2021 jrnl contributors -# License: https://www.gnu.org/licenses/gpl-3.0.html - -__version__ = "v2.6-beta" +__version__ = "v2.6-beta5" diff --git a/pyproject.toml b/pyproject.toml index 9a082829..9c1dee37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.6-beta" +version = "v2.6-beta5" description = "Collect your thoughts and notes without leaving the command line." authors = [ "jrnl contributors ", From b0de760621fb57e834836d62f7ed060b9ab6524c Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sun, 20 Dec 2020 02:31:26 +0000 Subject: [PATCH 27/38] Increment version to v2.6 --- jrnl/__version__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jrnl/__version__.py b/jrnl/__version__.py index 2765f166..fc38b65a 100644 --- a/jrnl/__version__.py +++ b/jrnl/__version__.py @@ -1 +1 @@ -__version__ = "v2.6-beta5" +__version__ = "v2.6" diff --git a/pyproject.toml b/pyproject.toml index 9c1dee37..c03a4f88 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jrnl" -version = "v2.6-beta5" +version = "v2.6" description = "Collect your thoughts and notes without leaving the command line." authors = [ "jrnl contributors ", From 3fb9fe5e28f04088498532d9ba8135a8bf92b3d6 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sun, 20 Dec 2020 02:32:59 +0000 Subject: [PATCH 28/38] Update changelog [ci skip] --- CHANGELOG.md | 80 ++++++++++++++++------------------------------------ 1 file changed, 24 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 085ac509..a0b430aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,77 +1,45 @@ # Changelog -## [v2.6-beta3](https://pypi.org/project/jrnl/v2.6-beta3/) (2020-12-19) +## [v2.6](https://pypi.org/project/jrnl/v2.6/) (2020-12-20) -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...v2.6-beta3) - -**Fixed bugs:** - -- Typo fix in output.py: "us" -\> "use" [\#1117](https://github.com/jrnl-org/jrnl/pull/1117) - -**Build:** - -- Change approach for docs workflow to use pa11y-ci [\#1116](https://github.com/jrnl-org/jrnl/pull/1116) -- Fix trigger for changelog [\#1114](https://github.com/jrnl-org/jrnl/pull/1114) -- Add automatic deployment for homebrew releases \(and prereleases\) [\#1111](https://github.com/jrnl-org/jrnl/pull/1111) - -**Documentation:** - -- Small accessibility fixes for docs site [\#1122](https://github.com/jrnl-org/jrnl/pull/1122) -- Comply with GPL by acknowledging all authors and including license info in each source file [\#1121](https://github.com/jrnl-org/jrnl/pull/1121) -- Fix lone closing parenthesis [\#1118](https://github.com/jrnl-org/jrnl/pull/1118) - -## [v2.6-beta](https://pypi.org/project/jrnl/v2.6-beta/) (2020-12-12) - -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5.1-alpha...v2.6-beta) +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5...v2.6) **Implemented enhancements:** -- Low Contrast Text on Webpage [\#1061](https://github.com/jrnl-org/jrnl/issues/1061) - -**Fixed bugs:** - -- Missing readline module can be dealt with more gracefully [\#1015](https://github.com/jrnl-org/jrnl/issues/1015) -- Check for readline module instead of Windows when initializing autocomplete in install [\#1104](https://github.com/jrnl-org/jrnl/pull/1104) - -**Build:** - -- Conduct a dependency audit [\#1052](https://github.com/jrnl-org/jrnl/issues/1052) -- Update all dependencies and lock file [\#1110](https://github.com/jrnl-org/jrnl/pull/1110) - -**Documentation:** - -- Make docs site \(jrnl.sh\) fully meet Web Content Accessibility Guidelines \(WCAG\) 2.1 [\#1105](https://github.com/jrnl-org/jrnl/pull/1105) - -## [v2.5.1-alpha](https://pypi.org/project/jrnl/v2.5.1-alpha/) (2020-11-28) - -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5...v2.5.1-alpha) - -**Implemented enhancements:** - -- Configure default display format in config [\#1014](https://github.com/jrnl-org/jrnl/issues/1014) +- Add ability to put --edit partly through a cli entry to move it to the editor [\#1091](https://github.com/jrnl-org/jrnl/pull/1091) ([wren](https://github.com/wren)) - Allow --edit flag partway through an entry [\#906](https://github.com/jrnl-org/jrnl/issues/906) -- Add ability to put --edit partly through a cli entry to move it to the editor [\#1091](https://github.com/jrnl-org/jrnl/pull/1091) **Fixed bugs:** +- Check for readline module instead of Windows when initializing autocomplete in install [\#1104](https://github.com/jrnl-org/jrnl/pull/1104) ([micahellison](https://github.com/micahellison)) - Directory export crashes in Windows with certain characters - UnicodeEncodeError: 'locale' codec can't encode character [\#1089](https://github.com/jrnl-org/jrnl/issues/1089) -- Fix Unicode encoding failure in directory export when creating filenames from journal titles with certain characters [\#1090](https://github.com/jrnl-org/jrnl/pull/1090) +- Fix Unicode encoding failure in directory export when creating filenames from journal titles with certain characters [\#1090](https://github.com/jrnl-org/jrnl/pull/1090) ([micahellison](https://github.com/micahellison)) +- Typo fix in output.py: "us" -\> "use" [\#1117](https://github.com/jrnl-org/jrnl/pull/1117) ([signal-9](https://github.com/signal-9)) **Build:** +- Add a release workflow for PyPI in CI \(Github Actions\) [\#1095](https://github.com/jrnl-org/jrnl/pull/1095) ([wren](https://github.com/wren)) +- Add automatic deployment for homebrew releases \(and prereleases\) [\#1111](https://github.com/jrnl-org/jrnl/pull/1111) ([wren](https://github.com/wren)) +- Add changelog generation workflow to github actions [\#1086](https://github.com/jrnl-org/jrnl/pull/1086) ([wren](https://github.com/wren)) +- Add fix for changelog conditional always returning false [\#1101](https://github.com/jrnl-org/jrnl/pull/1101) ([wren](https://github.com/wren)) +- Change approach for docs workflow to use pa11y-ci [\#1116](https://github.com/jrnl-org/jrnl/pull/1116) ([wren](https://github.com/wren)) +- Changelog fixes [\#1088](https://github.com/jrnl-org/jrnl/pull/1088) ([wren](https://github.com/wren)) +- Fix trigger for changelog [\#1114](https://github.com/jrnl-org/jrnl/pull/1114) ([wren](https://github.com/wren)) +- Make changelog auto exclude stale and wontfix issues [\#1081](https://github.com/jrnl-org/jrnl/pull/1081) ([wren](https://github.com/wren)) - Migrate to Github Actions from Travis CI [\#1060](https://github.com/jrnl-org/jrnl/issues/1060) -- Add fix for changelog conditional always returning false [\#1101](https://github.com/jrnl-org/jrnl/pull/1101) -- Add a release workflow for PyPI in CI \(Github Actions\) [\#1095](https://github.com/jrnl-org/jrnl/pull/1095) -- Udpate build badge in readme to point at github instead of travis [\#1094](https://github.com/jrnl-org/jrnl/pull/1094) -- More changelog fixes [\#1092](https://github.com/jrnl-org/jrnl/pull/1092) -- Changelog fixes [\#1088](https://github.com/jrnl-org/jrnl/pull/1088) -- Add changelog generation workflow to github actions [\#1086](https://github.com/jrnl-org/jrnl/pull/1086) -- get rid of travis and circle configs \(in favor of github actions\) [\#1082](https://github.com/jrnl-org/jrnl/pull/1082) -- Make changelog auto exclude stale and wontfix issues [\#1081](https://github.com/jrnl-org/jrnl/pull/1081) +- More changelog fixes [\#1092](https://github.com/jrnl-org/jrnl/pull/1092) ([wren](https://github.com/wren)) +- Standardize version regex in release pipeline [\#1124](https://github.com/jrnl-org/jrnl/pull/1124) ([wren](https://github.com/wren)) +- Udpate build badge in readme to point at github instead of travis [\#1094](https://github.com/jrnl-org/jrnl/pull/1094) ([wren](https://github.com/wren)) +- Update all dependencies and lock file [\#1110](https://github.com/jrnl-org/jrnl/pull/1110) ([wren](https://github.com/wren)) +- get rid of travis and circle configs \(in favor of github actions\) [\#1082](https://github.com/jrnl-org/jrnl/pull/1082) ([wren](https://github.com/wren)) **Documentation:** -- Add visual header to readme [\#1085](https://github.com/jrnl-org/jrnl/pull/1085) +- Add visual header to readme [\#1085](https://github.com/jrnl-org/jrnl/pull/1085) ([wren](https://github.com/wren)) +- Comply with GPL by acknowledging all authors and including license info in each source file [\#1121](https://github.com/jrnl-org/jrnl/pull/1121) ([micahellison](https://github.com/micahellison)) +- Fix lone closing parenthesis [\#1118](https://github.com/jrnl-org/jrnl/pull/1118) ([maebert](https://github.com/maebert)) +- Make docs site \(jrnl.sh\) fully meet Web Content Accessibility Guidelines \(WCAG\) 2.1 [\#1105](https://github.com/jrnl-org/jrnl/pull/1105) ([wren](https://github.com/wren)) +- Small accessibility fixes for docs site [\#1122](https://github.com/jrnl-org/jrnl/pull/1122) ([wren](https://github.com/wren)) ## [v2.5](https://pypi.org/project/jrnl/v2.5/) (2020-11-07) From f999caa3a362fe6f74df2275435316323a936cd6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 26 Dec 2020 10:52:55 -0800 Subject: [PATCH 29/38] Bump pytest from 6.2.0 to 6.2.1 (#1129) Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.0...6.2.1) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- poetry.lock | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2452e1aa..55033cef 100644 --- a/poetry.lock +++ b/poetry.lock @@ -424,7 +424,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "pytest" -version = "6.2.0" +version = "6.2.1" description = "pytest: simple powerful testing with Python" category = "dev" optional = false @@ -671,11 +671,13 @@ cffi = [ {file = "cffi-1.14.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb"}, {file = "cffi-1.14.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d"}, {file = "cffi-1.14.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03"}, + {file = "cffi-1.14.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01"}, {file = "cffi-1.14.4-cp37-cp37m-win32.whl", hash = "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e"}, {file = "cffi-1.14.4-cp37-cp37m-win_amd64.whl", hash = "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35"}, {file = "cffi-1.14.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d"}, {file = "cffi-1.14.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b"}, {file = "cffi-1.14.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53"}, + {file = "cffi-1.14.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e"}, {file = "cffi-1.14.4-cp38-cp38-win32.whl", hash = "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d"}, {file = "cffi-1.14.4-cp38-cp38-win_amd64.whl", hash = "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375"}, {file = "cffi-1.14.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909"}, @@ -833,8 +835,8 @@ pyparsing = [ {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] pytest = [ - {file = "pytest-6.2.0-py3-none-any.whl", hash = "sha256:d69e1a80b34fe4d596c9142f35d9e523d98a2838976f1a68419a8f051b24cec6"}, - {file = "pytest-6.2.0.tar.gz", hash = "sha256:b12e09409c5bdedc28d308469e156127004a436b41e9b44f9bff6446cbab9152"}, + {file = "pytest-6.2.1-py3-none-any.whl", hash = "sha256:1969f797a1a0dbd8ccf0fecc80262312729afea9c17f1d70ebf85c5e76c6f7c8"}, + {file = "pytest-6.2.1.tar.gz", hash = "sha256:66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306"}, ] python-dateutil = [ {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, @@ -863,6 +865,8 @@ pyyaml = [ {file = "PyYAML-5.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf"}, {file = "PyYAML-5.3.1-cp38-cp38-win32.whl", hash = "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97"}, {file = "PyYAML-5.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee"}, + {file = "PyYAML-5.3.1-cp39-cp39-win32.whl", hash = "sha256:ad9c67312c84def58f3c04504727ca879cb0013b2517c85a9a253f0cb6380c0a"}, + {file = "PyYAML-5.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:6034f55dab5fea9e53f436aa68fa3ace2634918e8b5994d82f3621c04ff5ed2e"}, {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"}, ] regex = [ @@ -979,19 +983,28 @@ typed-ast = [ {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"}, {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"}, {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"}, + {file = "typed_ast-1.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:fcf135e17cc74dbfbc05894ebca928ffeb23d9790b3167a674921db19082401f"}, {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"}, {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"}, {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"}, {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"}, {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"}, + {file = "typed_ast-1.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f208eb7aff048f6bea9586e61af041ddf7f9ade7caed625742af423f6bae3298"}, {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"}, {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"}, {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"}, {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"}, {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"}, + {file = "typed_ast-1.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:7e4c9d7658aaa1fc80018593abdf8598bf91325af6af5cce4ce7c73bc45ea53d"}, {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"}, {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"}, {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"}, + {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:92c325624e304ebf0e025d1224b77dd4e6393f18aab8d829b5b7e04afe9b7a2c"}, + {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:d648b8e3bf2fe648745c8ffcee3db3ff903d0817a01a12dd6a6ea7a8f4889072"}, + {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fac11badff8313e23717f3dada86a15389d0708275bddf766cca67a84ead3e91"}, + {file = "typed_ast-1.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:0d8110d78a5736e16e26213114a38ca35cb15b6515d535413b090bd50951556d"}, + {file = "typed_ast-1.4.1-cp39-cp39-win32.whl", hash = "sha256:b52ccf7cfe4ce2a1064b18594381bccf4179c2ecf7f513134ec2f993dd4ab395"}, + {file = "typed_ast-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:3742b32cf1c6ef124d57f95be609c473d7ec4c14d0090e5a5e05a15269fb4d0c"}, {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"}, ] typing-extensions = [ From b25ea7409a60ca37edd1718789586a8f6e489ae2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 26 Dec 2020 10:53:47 -0800 Subject: [PATCH 30/38] Bump keyring from 21.5.0 to 21.7.0 (#1128) Bumps [keyring](https://github.com/jaraco/keyring) from 21.5.0 to 21.7.0. - [Release notes](https://github.com/jaraco/keyring/releases) - [Changelog](https://github.com/jaraco/keyring/blob/main/CHANGES.rst) - [Commits](https://github.com/jaraco/keyring/compare/v21.5.0...v21.7.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 55033cef..d6d997a0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -212,7 +212,7 @@ python-versions = ">=3.6" [[package]] name = "keyring" -version = "21.5.0" +version = "21.7.0" description = "Store and access your passwords safely." category = "main" optional = false @@ -735,8 +735,8 @@ joblib = [ {file = "joblib-0.17.0.tar.gz", hash = "sha256:9e284edd6be6b71883a63c9b7f124738a3c16195513ad940eae7e3438de885d5"}, ] keyring = [ - {file = "keyring-21.5.0-py3-none-any.whl", hash = "sha256:12de23258a95f3b13e5b167f7a641a878e91eab8ef16fafc077720a95e6115bb"}, - {file = "keyring-21.5.0.tar.gz", hash = "sha256:207bd66f2a9881c835dad653da04e196c678bf104f8252141d2d3c4f31051579"}, + {file = "keyring-21.7.0-py3-none-any.whl", hash = "sha256:4c41ce4f6d1ee91d589a346699ef5a94ba3429603ac8f700cc0097644cdd6748"}, + {file = "keyring-21.7.0.tar.gz", hash = "sha256:a144f7e1044c897c3976202af868cb0ac860f4d433d5d0f8e750fa1a2f0f0b50"}, ] livereload = [ {file = "livereload-2.6.3.tar.gz", hash = "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"}, From 16e313ab704a24859fb1df3283f8c611a33da766 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 26 Dec 2020 10:55:19 -0800 Subject: [PATCH 31/38] Bump pytz from 2020.4 to 2020.5 (#1130) Bumps [pytz](https://github.com/stub42/pytz) from 2020.4 to 2020.5. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](https://github.com/stub42/pytz/compare/release_2020.4...release_2020.5) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index d6d997a0..cd5ac6d2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -457,7 +457,7 @@ six = ">=1.5" [[package]] name = "pytz" -version = "2020.4" +version = "2020.5" description = "World timezone definitions, modern and historical" category = "main" optional = false @@ -843,8 +843,8 @@ python-dateutil = [ {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, ] pytz = [ - {file = "pytz-2020.4-py2.py3-none-any.whl", hash = "sha256:5c55e189b682d420be27c6995ba6edce0c0a77dd67bfbe2ae6607134d5851ffd"}, - {file = "pytz-2020.4.tar.gz", hash = "sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268"}, + {file = "pytz-2020.5-py2.py3-none-any.whl", hash = "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4"}, + {file = "pytz-2020.5.tar.gz", hash = "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"}, ] pywin32-ctypes = [ {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, From 2f4ec7ca986d21f1a20b117f8f41b2cee9c101bd Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 26 Dec 2020 18:56:53 +0000 Subject: [PATCH 32/38] Update changelog [ci skip] --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0b430aa..b2211998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [Unreleased](https://github.com/jrnl-org/jrnl/) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6...HEAD) + +**Implemented enhancements:** + +- Implement dependency tracker/updater [\#1120](https://github.com/jrnl-org/jrnl/issues/1120) + ## [v2.6](https://pypi.org/project/jrnl/v2.6/) (2020-12-20) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5...v2.6) From 37c5b0eb110973e056029cc1650da64486bd8da6 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 26 Dec 2020 10:58:23 -0800 Subject: [PATCH 33/38] Fixes to changelog generator (#1127) * Fix version header detection in changelog This updates the regex to find the version header in our changelog. There was a bug that affected patch, alpha, and beta versions. For example, if we were looking for "v2.5" we might find "v2.5.1" or "v2.5.1-alpha" or other versions like that. This led to the changelog not being cleared properly on update, and old versions sticking around longer than they should. * re-add option to include author link for merged PRs in changelog This option was accidentally left out when migrating the changelog generator tool to github actions. * fix conditional in changelog workflow In github actions, booleans always end up as strings. So, it's not enough to test `env.FULL_RELEASE` because both 'true' and 'false' will evaluate as true. This fixes the conditional to check for the string value 'true' instead of relying on a boolean. --- .github/workflows/changelog.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index 62cf0408..5d18ca9d 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -77,7 +77,7 @@ jobs: - name: Prep changelog file (clear out old lines) run: | # delete the top of the changelog up to the correct tag - tagline=$(grep -n "^## \[\?${SINCE_TAG}\]\?" "$FILENAME" | awk '{print $1}' FS=':' | head -1) + tagline=$(grep -n "^## \[${SINCE_TAG}\]" "$FILENAME" | awk '{print $1}' FS=':' | head -1) echo "tagline: ${tagline}" if [[ -z $tagline ]]; then @@ -112,6 +112,7 @@ jobs: releaseUrl: https://pypi.org/project/jrnl/%s/ releaseBranch: develop verbose: false + author: true - name: Small fixes run: | @@ -139,7 +140,7 @@ jobs: git push origin $BRANCH - name: Merge to Release branch - if: env.FULL_RELEASE + if: env.FULL_RELEASE == 'true' run: | git checkout release git merge --ff-only $BRANCH From 9a4c3e41a6edb4d4ab3a6b126db23cba68365f85 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 26 Dec 2020 19:00:18 +0000 Subject: [PATCH 34/38] Update changelog [ci skip] --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2211998..513031c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - Implement dependency tracker/updater [\#1120](https://github.com/jrnl-org/jrnl/issues/1120) +**Build:** + +- Fix changelog generator [\#1127](https://github.com/jrnl-org/jrnl/pull/1127) ([wren](https://github.com/wren)) + ## [v2.6](https://pypi.org/project/jrnl/v2.6/) (2020-12-20) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5...v2.6) From 870f9aed17d85cccb6a4a53b0b998024e9d20a74 Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 26 Dec 2020 11:01:27 -0800 Subject: [PATCH 35/38] Fix failing contrast test in accessibility tools on docs site (#1126) * add background-color as fallback for gradients on docs site This is both for old browser support, and for accessibility. Some accessibility tools turn off gradients since they can make text hard to read for those with visual impairment. * change mobile header color for docs site The mobile header was using a light-purple to dark-purple gradient, even though every other gradient on the site is mid-purple to dark-purple. This commit changes that both for consistency on the site, and because light-purple causes an accessibility issue with the white text in the header (even though the accessibility tools don't notice because of the gradient). --- docs_theme/assets/index.css | 3 +++ docs_theme/assets/theme.css | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs_theme/assets/index.css b/docs_theme/assets/index.css index 6a05be25..472de17e 100644 --- a/docs_theme/assets/index.css +++ b/docs_theme/assets/index.css @@ -66,6 +66,7 @@ h3 { } header { + background-color: --mid-purple; background-image: linear-gradient(211deg, var(--mid-purple) 0%, var(--dark-purple) 100%); color: var(--white); border: 0px solid transparent; @@ -202,6 +203,7 @@ nav a:visited:hover { nav a.cta { display: inline-block; color: var(--white); + background-color: --mid-purple; background-image: linear-gradient(259deg, var(--mid-purple) 0%, var(--dark-purple) 100%); box-shadow: 0 2px 8px 0 var(--blacker-shadow); border-radius: 50px; @@ -213,6 +215,7 @@ nav a.cta { nav a.cta:hover { text-decoration: none; + background-color: --mid-purple; background-image: linear-gradient(259deg, var(--bright-purple) 0%, var(--dark-purple) 100%); box-shadow: 0 4px 16px 0 var(--black-shadow); color: var(--off-white); diff --git a/docs_theme/assets/theme.css b/docs_theme/assets/theme.css index 9c78ded8..29b32c68 100644 --- a/docs_theme/assets/theme.css +++ b/docs_theme/assets/theme.css @@ -76,7 +76,8 @@ div.rst-content { } .wy-nav-top { - background-image: linear-gradient(-211deg, var(--light-purple) 0%, var(--dark-purple) 100%); + background-color: --mid-purple; + background-image: linear-gradient(-211deg, var(--mid-purple) 0%, var(--dark-purple) 100%); } .wy-nav-top .fa-bars { @@ -172,6 +173,7 @@ a.icon-home:before { .wy-nav-side { + background-color: --mid-purple; background-image: linear-gradient(211deg, var(--mid-purple) 0%, var(--dark-purple) 100%); font-weight: 300; height: 100%; From fc8eafa451670176e41d502b777f24fa2c25ffed Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 26 Dec 2020 19:02:42 +0000 Subject: [PATCH 36/38] Update changelog [ci skip] --- CHANGELOG.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 513031c2..43eb217b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,3 @@ -# Changelog - -## [Unreleased](https://github.com/jrnl-org/jrnl/) - -[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6...HEAD) - -**Implemented enhancements:** - -- Implement dependency tracker/updater [\#1120](https://github.com/jrnl-org/jrnl/issues/1120) - -**Build:** - -- Fix changelog generator [\#1127](https://github.com/jrnl-org/jrnl/pull/1127) ([wren](https://github.com/wren)) - ## [v2.6](https://pypi.org/project/jrnl/v2.6/) (2020-12-20) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5...v2.6) @@ -546,6 +532,3 @@ ## v0.0 (2012-03-29) * __0.0.1__ Composing entries works. That's pretty much it. - - -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* From 8b70497802e2e747c60886c1ca32026f1cc6f9cb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 26 Dec 2020 11:59:53 -0800 Subject: [PATCH 37/38] Create Dependabot config file (#1131) Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..070f47f8 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: +- package-ecosystem: pip + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + reviewers: + - wren + - micahellison + labels: + - packaging From 15d364b5f3b05b1218ea6145c2493afce1747c42 Mon Sep 17 00:00:00 2001 From: Jrnl Bot Date: Sat, 26 Dec 2020 20:01:40 +0000 Subject: [PATCH 38/38] Update changelog [ci skip] --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43eb217b..a4c6a413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +# Changelog + +## [Unreleased](https://github.com/jrnl-org/jrnl/) + +[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6...HEAD) + +**Implemented enhancements:** + +- Implement dependency tracker/updater [\#1120](https://github.com/jrnl-org/jrnl/issues/1120) + +**Build:** + +- Fix changelog generator [\#1127](https://github.com/jrnl-org/jrnl/pull/1127) ([wren](https://github.com/wren)) + +**Documentation:** + +- Fix failing contrast test in accessibility tools on docs site [\#1126](https://github.com/jrnl-org/jrnl/pull/1126) ([wren](https://github.com/wren)) + ## [v2.6](https://pypi.org/project/jrnl/v2.6/) (2020-12-20) [Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.5...v2.6) @@ -532,3 +550,6 @@ ## v0.0 (2012-03-29) * __0.0.1__ Composing entries works. That's pretty much it. + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*