diff --git a/docs/refresh.svg b/docs/refresh.svg
deleted file mode 100644
index 04e62f0..0000000
--- a/docs/refresh.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
-
-
-
-
- path master $ path master $ g i t diff ...FETCH path master $ gi t diff ...FETCH path master $ git diff ...FETCH path master $ git d iff ...FETCH path master $ git f e tch gh://jaraco/skeleton path master $ git fe t ch gh://jaraco/skeleton path master $ git fet c h gh://jaraco/skeleton path master $ git fetc h gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git fetch g h://jaraco/skeleton path master $ git fetch g h ://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:// j araco/skeleton path master $ git fetch gh://j a raco/skeleton path master $ git fetch gh://ja r aco/skeleton path master $ git fetch gh://jar a co/skeleton path master $ git fetch gh://jara c o/skeleton path master $ git fetch gh://jarac o /skeleton path master $ git fetch gh://jaraco / skeleton path master $ git fetch gh://jaraco/ s keleton path master $ git fetch gh://jaraco/s k eleton path master $ git fetch gh://jaraco/sk e leton path master $ git fetch gh://jaraco/ske l eton path master $ git fetch gh://jaraco/skel e ton path master $ git fetch gh://jaraco/skele t on path master $ git fetch gh://jaraco/skelet o n path master $ git fetch gh://jaraco/skeleto n path master $ git fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton From https://github.com/jaraco/skeleton * branch HEAD -> FETCH_HEAD path master $ path master $ g i t fetch gh://jaraco/skeleton path master $ gi t fetch gh://jaraco/skeleton path master $ git fetch gh://jaraco/skeleton path master $ git f etch gh://jaraco/skeleton path master $ git d i ff ...FETCH path master $ git di f f ...FETCH path master $ git dif f ...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 ... F ETCH path master $ git diff ...F E TCH path master $ git diff ...FE T CH path master $ git diff ...FET C H path master $ git diff ...FETC H 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.cfg index 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 $ g i t diff ...FETCH_HEAD path master $ gi t diff ...FETCH_HEAD path master $ git diff ...FETCH_HEAD path master $ git d iff ...FETCH_HEAD path master $ git p u sh path master $ git pu s h path master $ git pul l path master $ git pull path master $ git pull g h://jaraco/skeleton path master $ git pull g h ://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:// j araco/skeleton path master $ git pull gh://j a raco/skeleton path master $ git pull gh://ja r aco/skeleton path master $ git pull gh://jar a co/skeleton path master $ git pull gh://jara c o/skeleton path master $ git pull gh://jarac o /skeleton path master $ git pull gh://jaraco / skeleton path master $ git pull gh://jaraco/ s keleton path master $ git pull gh://jaraco/s k eleton path master $ git pull gh://jaraco/sk e leton path master $ git pull gh://jaraco/ske l eton path master $ git pull gh://jaraco/skel e ton path master $ git pull gh://jaraco/skele t on path master $ git pull gh://jaraco/skelet o n path master $ git pull gh://jaraco/skeleto n path master $ git pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton Auto-merging setup.cfg Auto-merging azure-pipelines.yml Merge made by the 'recursive' strategy. azure-pipelines.yml | 16 +++++++++++++++ - setup.cfg | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) path master $ g i t pull gh://jaraco/skeleton path master $ gi t pull gh://jaraco/skeleton path master $ git pull gh://jaraco/skeleton path master $ git p ull gh://jaraco/skeleton path master $ git p u ll gh://jaraco/skeleton path master $ git pu l l gh://jaraco/skeleton path master $ git pus h path master $ git push path master $ git push Enumerating objects: 10, done. C ounting objects: 50% (5/10) Counting objects: 100% (10/10), done. Delta compression using up to 8 threads Compressing 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 0 remote: Resolving deltas: 100% (3/3), completed with 3 local objects. To https://github.com/jaraco/path ff4d395..bd18026 master -> master path master $
-
\ No newline at end of file
diff --git a/skeleton.md b/skeleton.md
index 4544158..17a94ed 100644
--- a/skeleton.md
+++ b/skeleton.md
@@ -40,6 +40,10 @@ The `--allow-unrelated-histories` is necessary because the history from the skel
Whenever a change is needed or desired for the general technique for packaging, it can be made in the skeleton project and then merged into each of the derived projects as needed, recommended before each release. As a result, features and best practices for packaging are centrally maintained and readily trickle into a whole suite of packages. This technique lowers the amount of tedious work necessary to create or maintain a project, and coupled with other techniques like continuous integration and deployment, lowers the cost of creating and maintaining refined Python projects to just a few, familiar Git operations.
+For example, here's a session of the [path project](https://pypi.org/project/path) pulling non-conflicting changes from the skeleton:
+
+
+
Thereafter, the target project can make whatever customizations it deems relevant to the scaffolding. The project may even at some point decide that the divergence is too great to merit renewed merging with the original skeleton. This approach applies maximal guidance while creating minimal constraints.
# Features