From 814eb669c2e5436d8ebce1be845fa99e0687317b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 23 May 2020 12:17:23 -0400 Subject: [PATCH] Add 'refresh.svg' demonstrating an example of refreshing a project with the latest skeleton. Ref #7. --- docs/refresh.svg | 193 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 docs/refresh.svg diff --git a/docs/refresh.svg b/docs/refresh.svg new file mode 100644 index 00000000..04e62f00 --- /dev/null +++ b/docs/refresh.svg @@ -0,0 +1,193 @@ + + + + + + + + + + + path master $ path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton From https://github.com/jaraco/skeleton * branch HEAD -> FETCH_HEADpath master $ path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH path master $ git diff ...FETCH_ path master $ git diff ...FETCH_H path master $ git diff ...FETCH_HE path master $ git diff ...FETCH_HEA path master $ git diff ...FETCH_HEAD path master $ git diff ...FETCH_HEAD diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fd43296..2be55e7 100644--- a/azure-pipelines.yml+++ b/azure-pipelines.yml@@ -29,9 +29,12 @@ stages: python.version: '3.6' Bionic Python 3.8: python.version: '3.8'- Windows:+ Windows Python 3.8: pool_vm_image: vs2017-win2016+ Windows Python Prerelease:+ python.version: '3.9'+ pool_vm_image: vs2017-win2016 MacOS: pool_vm_image: macos-10.15@@ -39,10 +42,21 @@ stages: maxParallel: 4 steps:+ - task: NuGetToolInstaller@1+ displayName: 'Install NuGet'+ condition: eq(variables['pool_vm_image'], 'vs2017-win2016')++ - powershell: |+ nuget install python -Prerelease -OutputDi + nuget install python -Prerelease -OutputDirectory "$(Build.BinariesDirectory)" -ExcludeVersion -NonInteractive+ Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)\python\tools"+ Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)\python\tools\Scripts"+ condition: and(succeeded(), and(eq(variables['python.version'], '3.9'), eq(variables['pool_vm_image'], 'vs2017-win2016'))) - task: UsePythonVersion@0 inputs: versionSpec: '$(python.version)' architecture: 'x64'+ condition: and(succeeded(), ne(variables['python.version'], '3.9')) - script: python -m pip install tox displayName: 'Install tox'diff --git a/setup.cfg b/setup.cfgindex e2dcebb..0cf9549 100644--- a/setup.cfg+++ b/setup.cfg@@ -29,6 +29,8 @@ testing = pytest-black >= 0.3.7 pytest-cov pytest-mypy+ # workaround for python/mypy#8627: + mypy@git+https://github.com/python/mypy # local(END) path master $ git diff ...FETCH_HEAD path master $ git diff ...FETCH_HEAD path master $ git diff ...FETCH_HEAD path master $ git diff ...FETCH_HEAD path master $ git push path master $ git push path master $ git pull path master $ git pull path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton Auto-merging setup.cfgAuto-merging azure-pipelines.ymlMerge made by the 'recursive' strategy. azure-pipelines.yml | 16 +++++++++++++++- setup.cfg | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-)path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git push path master $ git push path master $ git push Enumerating objects: 10, done. Counting objects: 50% (5/10)Counting objects: 100% (10/10), done.Delta compression using up to 8 threadsCompressing objects: 100% (4/4), done.Writing objects: 100% (4/4), 512 bytes | 512.00 KiB/s, done.Total 4 (delta 3), reused 0 (delta 0), pack-reused 0remote: Resolving deltas: 100% (3/3), completed with 3 local objects. To https://github.com/jaraco/path ff4d395..bd18026 master -> masterpath master $ + \ No newline at end of file