From c9c19e2710b0aad65c93b2631da46a23eadc5d3d Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Sun, 24 Apr 2022 19:08:37 -0500 Subject: [PATCH 1/9] docs(CHANGES): fix header for 1.12.0 --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 12640fb5..cdacf3a4 100644 --- a/CHANGES +++ b/CHANGES @@ -19,7 +19,7 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force - _Add your latest changes from PRs here_ -## v1.12.0 (2022-04-24) +## vcspull 1.12.0 (2022-04-24) ### Breaking changes From febc03d463576cabc3728798dac5f7e498c22b3e Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Mon, 25 Apr 2022 22:39:48 -0500 Subject: [PATCH 2/9] docs(sidebar): Link size and unlink hostname --- docs/_static/css/custom.css | 13 +++++-------- docs/_templates/sidebar/projects.html | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css index aefd33b4..3bf24f5e 100644 --- a/docs/_static/css/custom.css +++ b/docs/_static/css/custom.css @@ -1,25 +1,23 @@ h2 { - font-size: 2rem; margin-bottom: 1.25rem; margin-top: 1.25rem; scroll-margin-top: 0.5rem; } h3 { - font-size: 1.5rem; margin-bottom: 1.25rem; margin-top: 1.25rem; scroll-margin-top: 0.5rem; } h4 { - font-size: 1.25rem; margin-bottom: 1.25rem; scroll-margin-top: 0.5rem; } .sidebar-tree p.indented-block { - padding: var(--sidebar-item-spacing-vertical) var(--sidebar-item-spacing-horizontal) 0 var(--sidebar-item-spacing-horizontal); + padding: var(--sidebar-item-spacing-vertical) var(--sidebar-item-spacing-horizontal) 0 + var(--sidebar-item-spacing-horizontal); margin-bottom: 0; } @@ -28,13 +26,12 @@ h4 { display: block; } -.sidebar-tree p.indented-block > :not(.project-name) { - font-size: var(--toc-font-size); -} - .sidebar-tree p.indented-block .project-name { font-size: var(--sidebar-item-font-size); font-weight: bold; margin-right: calc(var(--sidebar-item-spacing-horizontal) / 2.5); } +.sidebar-tree .active { + font-weight: bold; +} diff --git a/docs/_templates/sidebar/projects.html b/docs/_templates/sidebar/projects.html index 7e9d6780..330d1593 100644 --- a/docs/_templates/sidebar/projects.html +++ b/docs/_templates/sidebar/projects.html @@ -1,4 +1,4 @@ -
+ + From a1f9ac6361d44bf43aebd96e2152c9cd9ab24799 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Tue, 26 Apr 2022 05:58:57 -0500 Subject: [PATCH 3/9] docs(CHANGES): Fix issue links --- CHANGES | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index cdacf3a4..10a20630 100644 --- a/CHANGES +++ b/CHANGES @@ -24,7 +24,7 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force ### Breaking changes - Config location uses `XDG_CONFIG_HOME` from [XDG Base Directory], - ({issue}`#367`). + ({issue}`367`). Old path: `~/.vcspull` @@ -32,12 +32,12 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force [xdg base directory]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html -- Override config directory via `VCSPULL_CONFIGDIR` ({issue}`#367`) -- Switch from `str` to `pathlib.Path` ({issue}`#364`) +- Override config directory via `VCSPULL_CONFIGDIR` ({issue}`367`) +- Switch from `str` to `pathlib.Path` ({issue}`364`) ### Compatibility -- Allow click 8.1.x ({issue}`#372`) +- Allow click 8.1.x ({issue}`372`) - vcspull learned `-h` for help (thanks HN 2022-04-11) - Python 3.7 and 3.8 dropped (#356) @@ -78,7 +78,7 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force ### Compatibility -- Allow click 8.1.x (backport of {issue}`#372`) +- Allow click 8.1.x (backport of {issue}`372`) ## vcspull 1.11.3 (2022-04-11) From 80dd6a83db857b0dbdeaddc6c09cc9110437c5ca Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Tue, 26 Apr 2022 06:00:49 -0500 Subject: [PATCH 4/9] docs(conf): Fix issues_github_path --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 302c0ccf..d479625c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -96,7 +96,7 @@ copybutton_remove_prompts = True # sphinx-issues -issues_github_path = "vcs-python/libvcs" +issues_github_path = "vcs-python/vcspull" # sphinxext-rediraffe rediraffe_redirects = "redirects.txt" From 9e5bc999097a78726a06e463b3415951124cc248 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Fri, 29 Apr 2022 08:30:05 -0500 Subject: [PATCH 5/9] docs(API): Typo --- docs/api.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/api.md b/docs/api.md index acb53f25..152b4df6 100644 --- a/docs/api.md +++ b/docs/api.md @@ -3,15 +3,14 @@ # API Reference :::{seealso} -If you case needs granular control, check out {ref}`libvcs ` for its [Command API](https://libvcs.git-pull.com/cmd/) and {ref}`Projects API ` -and {ref}`Quickstart `. +For granular control see {ref}`libvcs `'s {ref}`Commands ` and {ref}`Projects `. ::: ## Internals :::{warning} These APIs are purely internal not covered by versioning policies, they can and will break between versions. -If you need an internal API stabilized please [file an issue](https://github.com/vcs-python/libvcs/issues). +If you need an internal API stabilized please [file an issue](https://github.com/vcs-python/vcspull/issues). ::: ## Exceptions From cd0c9b38f2eccef854850b7994ea094907b21fe8 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Sat, 30 Apr 2022 04:23:32 -0500 Subject: [PATCH 6/9] build(deps): click 8.1.3, jinja 3.1.2 --- poetry.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 9f3b23d2..b7796394 100644 --- a/poetry.lock +++ b/poetry.lock @@ -97,7 +97,7 @@ unicode_backport = ["unicodedata2"] [[package]] name = "click" -version = "8.1.2" +version = "8.1.3" description = "Composable command line interface toolkit" category = "main" optional = false @@ -230,7 +230,7 @@ plugins = ["setuptools"] [[package]] name = "jinja2" -version = "3.1.1" +version = "3.1.2" description = "A very fast and expressive template engine." category = "dev" optional = false @@ -912,8 +912,8 @@ charset-normalizer = [ {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, ] click = [ - {file = "click-8.1.2-py3-none-any.whl", hash = "sha256:24e1a4a9ec5bf6299411369b208c1df2188d9eb8d916302fe6bf03faed227f1e"}, - {file = "click-8.1.2.tar.gz", hash = "sha256:479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72"}, + {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, + {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, ] codecov = [ {file = "codecov-2.1.12-py2.py3-none-any.whl", hash = "sha256:585dc217dc3d8185198ceb402f85d5cb5dbfa0c5f350a5abcdf9e347776a5b47"}, @@ -1000,8 +1000,8 @@ isort = [ {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, ] jinja2 = [ - {file = "Jinja2-3.1.1-py3-none-any.whl", hash = "sha256:539835f51a74a69f41b848a9645dbdc35b4f20a3b601e2d9a7e22947b15ff119"}, - {file = "Jinja2-3.1.1.tar.gz", hash = "sha256:640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9"}, + {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, + {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, ] kaptan = [ {file = "kaptan-0.5.12.tar.gz", hash = "sha256:1abd1f56731422fce5af1acc28801677a51e56f5d3c3e8636db761ed143c3dd2"}, From 03f4a8df3b98c267762a7b6541461ef80a8afdd8 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Mon, 2 May 2022 05:59:05 -0500 Subject: [PATCH 7/9] build(deps): poetry: Lock at click 8 shell_completion requires new click version See also: https://click.palletsprojects.com/en/8.0.x/changes/#version-8-0-0 --- poetry.lock | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/poetry.lock b/poetry.lock index b7796394..a24c5580 100644 --- a/poetry.lock +++ b/poetry.lock @@ -855,7 +855,7 @@ test = [] [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "01faeff639b83b9d05fb376bb2908815d240754cbf89dbd5e7cd2ef1a2a47511" +content-hash = "a8afebc05b467c0d8fc4bc895d3e7e4b32bf045d48c3e59cfbdbac8ab4570764" [metadata.files] alabaster = [ diff --git a/pyproject.toml b/pyproject.toml index e4e33bb7..798c5698 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ vcspull = 'vcspull:cli.cli' [tool.poetry.dependencies] python = "^3.9" -click = ">=7<8.2" +click = "~8" kaptan = "*" libvcs = "~0.12.0" colorama = ">=0.3.9" From 9047a141c274cbb1e55450c66a9b468ac77a67e9 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Mon, 2 May 2022 06:00:28 -0500 Subject: [PATCH 8/9] docs(CHANGES): Note patch for v1.12.x See also: https://github.com/vcs-python/vcspull/tree/v1.12.x --- CHANGES | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGES b/CHANGES index 10a20630..fb11ff6d 100644 --- a/CHANGES +++ b/CHANGES @@ -19,8 +19,17 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force - _Add your latest changes from PRs here_ +## vcspull 1.12.1 (2022-05-02) + +### Bug fixes + +- Pin [click at + 8+](https://click.palletsprojects.com/en/8.0.x/changes/#version-8-0-0) + ## vcspull 1.12.0 (2022-04-24) +Patch branch: [`v1.12.x`](https://github.com/vcs-python/vcspull/tree/v1.12.x) + ### Breaking changes - Config location uses `XDG_CONFIG_HOME` from [XDG Base Directory], @@ -34,6 +43,7 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force - Override config directory via `VCSPULL_CONFIGDIR` ({issue}`367`) - Switch from `str` to `pathlib.Path` ({issue}`364`) +- Requires click 8+ ### Compatibility From a7c842592091ca9becb28ca3a9f46c9ee269dae0 Mon Sep 17 00:00:00 2001 From: Tony Narlock Date: Mon, 2 May 2022 06:06:39 -0500 Subject: [PATCH 9/9] Tag v1.12.1 --- pyproject.toml | 2 +- vcspull/__about__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 798c5698..a8a0d7d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "vcspull" -version = "1.12.0" +version = "1.12.1" description = "Bulk sync git, mercurial, and svn projects" license = "MIT" authors = ["Tony Narlock "] diff --git a/vcspull/__about__.py b/vcspull/__about__.py index 5d5ab0bb..3b832625 100644 --- a/vcspull/__about__.py +++ b/vcspull/__about__.py @@ -1,7 +1,7 @@ __title__ = "vcspull" __package_name__ = "vcspull" __description__ = "Bulk sync git, mercurial, and svn projects" -__version__ = "1.12.0" +__version__ = "1.12.1" __author__ = "Tony Narlock" __github__ = "https://github.com/vcs-python/vcspull" __docs__ = "https://vcspull.git-pull.com"