Merge branch 'main' into gh-70

Author: zooba

.github/ISSUE_TEMPLATE/ask-a-question.md

@@ -0,0 +1,18 @@
+---
+name: Ask a question
+about: Not sure it's a bug? Ask us here
+title: ''
+labels: question
+assignees: ''
+
+---
+
+# Background
+
+Please let us know how you installed the Python install manager, and/or what you are trying to do. A lot of questions are answered at https://docs.python.org/dev/using/windows.html.
+
+# Details
+
+Any more details about what you've tried, what you expected to happen, or what you would like to see.
+
+Got logs? (Check your `%TEMP%` directory.) Drag-and-drop files to attach them here, or paste relevant output in a code block.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+If you have log files (check your `%TEMP%` directory!), drag-and-drop them here to include them.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/build.yml

@@ -30,10 +30,30 @@ jobs:
         }
       shell: powershell
 
-    - name: Set up Python 3.14
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.14-dev
+    #- name: Set up Python 3.14
+    #  uses: actions/setup-python@v5
+    #  with:
+    #    python-version: 3.14-dev
+
+    # We move faster than GitHub's Python runtimes, so use NuGet instead
+    # One day we can use ourselves to download Python, but not yet...
+    - name: Set up NuGet
+      uses: nuget/[email protected]
+
+    - name: Set up Python 3.14.0b1
+      run: |
+        nuget install python -Version 3.14.0-b1 -x -o .
+        $py = Get-Item python\tools
+        Write-Host "Adding $py to PATH"
+        "$py" | Out-File $env:GITHUB_PATH -Encoding UTF8 -Append
+      working-directory: ${{ runner.temp }}
+
+    - name: Check Python version is 3.14.0b1
+      run: >
+        python -c "import sys;
+        print(sys.version);
+        print(sys.executable);
+        sys.exit(0 if sys.version_info[:5] == (3, 14, 0, 'beta', 1) else 1)"
 
     - name: Install build dependencies
       run: python -m pip install "pymsbuild>=1.2.0b1"

_msbuild.py

@@ -4,7 +4,7 @@
 
 
 DLL_NAME = "python314"
-EMBED_URL = "https://www.python.org/ftp/python/3.14.0/python-3.14.0a7-embed-amd64.zip"
+EMBED_URL = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-embed-amd64.zip"
 
 def can_embed(tag):
     """Return False if tag doesn't match DLL_NAME and EMBED_URL.

ci/repartition-index.yml

@@ -0,0 +1,84 @@
+# Repartitioning runs on Azure Pipelines, because that's where we have SSH
+# access to the download server.
+
+name: $(Date:yyyyMMdd).$(Rev:r)
+
+# Do not run automatically
+trigger: none
+
+
+parameters:
+- name: Publish
+  displayName: "Publish"
+  type: boolean
+  default: false
+- name: TestPublish
+  displayName: "Run all steps without publishing"
+  type: boolean
+  default: false
+
+stages:
+- stage: PyManagerIndexPartition
+  displayName: 'Repartition PyManager Index'
+
+  jobs:
+  - job: Repartition
+
+    pool:
+      vmImage: 'windows-latest'
+
+    variables:
+    - group: PythonOrgPublish
+
+    steps:
+    - checkout: self
+
+    - task: NugetToolInstaller@0
+      displayName: 'Install Nuget'
+
+    - powershell: |
+        nuget install -o host_python -x -noninteractive -prerelease python
+        Write-Host "##vso[task.prependpath]$(gi host_python\python\tools)"
+      displayName: 'Install host Python'
+      workingDirectory: $(Build.BinariesDirectory)
+
+    - powershell: |
+        cd (mkdir -Force index)
+        python "$(Build.SourcesDirectory)\scripts\repartition-index.py" --windows-default
+      displayName: 'Repartition index'
+      workingDirectory: $(Build.BinariesDirectory)
+
+    - publish: $(Build.BinariesDirectory)\index
+      artifact: index
+      displayName: Publish index artifact
+
+    - ${{ if or(eq(parameters.Publish, 'true'), eq(parameters.TestPublish, 'true')) }}:
+      - ${{ if ne(parameters.TestPublish, 'true') }}:
+        - task: DownloadSecureFile@1
+          name: sshkey
+          inputs:
+            secureFile: pydotorg-ssh.ppk
+          displayName: 'Download PuTTY key'
+
+      - powershell: |
+          git clone https://github.com/python/cpython-bin-deps --branch putty --single-branch --depth 1 --progress -v "putty"
+          "##vso[task.prependpath]$(gi putty)"
+        workingDirectory: $(Pipeline.Workspace)
+        displayName: 'Download PuTTY binaries'
+
+      - powershell: |
+          python ci\upload.py
+        displayName: 'Publish packages'
+        env:
+          UPLOAD_URL: $(PyDotOrgUrlPrefix)python/
+          UPLOAD_DIR: $(Build.BinariesDirectory)\index
+          UPLOAD_URL_PREFIX: $(PyDotOrgUrlPrefix)
+          UPLOAD_PATH_PREFIX: $(PyDotOrgUploadPathPrefix)
+          UPLOAD_HOST: $(PyDotOrgServer)
+          UPLOAD_HOST_KEY: $(PyDotOrgHostKey)
+          UPLOAD_USER: $(PyDotOrgUsername)
+          UPLOADING_INDEX: true
+          ${{ if eq(parameters.TestPublish, 'true') }}:
+            NO_UPLOAD: 1
+          ${{ else }}:
+            UPLOAD_KEYFILE: $(sshkey.secureFilePath)

ci/upload.py

@@ -9,14 +9,15 @@
 UPLOAD_PATH_PREFIX = os.getenv("UPLOAD_PATH_PREFIX", "/srv/www.python.org/ftp/")
 UPLOAD_URL = os.getenv("UPLOAD_URL")
 UPLOAD_DIR = os.getenv("UPLOAD_DIR")
-# A version will be inserted before the extension later on
-MANIFEST_FILE = os.getenv("MANIFEST_FILE")
 UPLOAD_HOST = os.getenv("UPLOAD_HOST", "")
 UPLOAD_HOST_KEY = os.getenv("UPLOAD_HOST_KEY", "")
 UPLOAD_KEYFILE = os.getenv("UPLOAD_KEYFILE", "")
 UPLOAD_USER = os.getenv("UPLOAD_USER", "")
 NO_UPLOAD = os.getenv("NO_UPLOAD", "no")[:1].lower() in "yt1"
 
+# Set to 'true' when updating index.json, rather than the app
+UPLOADING_INDEX = os.getenv("UPLOADING_INDEX", "no")[:1].lower() in "yt1"
+
 
 if not UPLOAD_URL:
     print("##[error]Cannot upload without UPLOAD_URL")
@@ -179,10 +180,15 @@ def purge(url):
 
 UPLOADS = []
 
-for pat in ("python-manager-*.msix", "python-manager-*.msi", "pymanager.appinstaller"):
-    for f in UPLOAD_DIR.glob(pat):
+if UPLOADING_INDEX:
+    for f in UPLOAD_DIR.glob("*.json"):
         u = UPLOAD_URL + f.name
         UPLOADS.append((f, u, url2path(u)))
+else:
+    for pat in ("python-manager-*.msix", "python-manager-*.msi", "pymanager.appinstaller"):
+        for f in UPLOAD_DIR.glob(pat):
+            u = UPLOAD_URL + f.name
+            UPLOADS.append((f, u, url2path(u)))
 
 print("Planned uploads:")
 for f, u, p in UPLOADS: