Merge branch 'main' into improve-csv

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,13 +30,33 @@ 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
+      run: python -m pip install "pymsbuild>=1.2.0b1"
 
     - name: 'Install test runner'
       run: python -m pip install pytest pytest-cov
@@ -129,6 +149,13 @@ jobs:
 
     - name: 'Launch default runtime'
       run: pymanager exec -m site
+      env:
+        PYMANAGER_DEBUG: true
+
+    - name: 'Uninstall runtime'
+      run: pymanager uninstall -y default
+      env:
+        PYMANAGER_DEBUG: true
 
     - name: 'Emulate first launch'
       run: |
@@ -138,7 +165,7 @@ jobs:
             download_dir="$i\_cache";
             global_dir="$i\_bin";
         } | Out-File $env:PYTHON_MANAGER_CONFIG -Encoding utf8
-        pymanager exec
+        pymanager install --configure -y
         if ($?) { pymanager list }
       env:
         PYTHON_MANAGER_INCLUDE_UNMANAGED: false

_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.
@@ -84,6 +84,9 @@ class ResourceFile(CSourceFile):
     CFunction('date_as_str'),
     CFunction('datetime_as_str'),
     CFunction('reg_rename_key'),
+    CFunction('get_current_package'),
+    CFunction('read_alias_package'),
+    CFunction('broadcast_settings_change'),
     source='src/_native',
     RootNamespace='_native',
 )
@@ -107,6 +110,7 @@ def main_exe(name):
         ConfigurationType='Application',
     )
 
+
 def mainw_exe(name):
     return CProject(name,
         VersionInfo(FileDescription="Python Install Manager (windowed)"),
@@ -127,11 +131,60 @@ def mainw_exe(name):
     )
 
 
+def launcher_exe(name, platform, windowed=False):
+    return CProject(name,
+        VersionInfo(
+            FileDescription="Python launcher" + (" (windowed)" if windowed else ""),
+            OriginalFilename=f"{name}.exe"
+        ),
+        CPP_SETTINGS,
+        Property('StaticLibcppLinkage', 'true'),
+        ItemDefinition('Link', SubSystem='WINDOWS' if windowed else 'CONSOLE'),
+        Manifest('default.manifest'),
+        ResourceFile('pywicon.rc' if windowed else 'pyicon.rc'),
+        CSourceFile('launcher.cpp'),
+        CSourceFile('_launch.cpp'),
+        IncludeFile('*.h'),
+        source='src/pymanager',
+        ConfigurationType='Application',
+        Platform=platform,
+    )
+
+
+def pyshellext(ext='.exe', **props):
+    link_opts = ItemDefinition(
+        'Link',
+        AdditionalDependencies=Prepend('RuntimeObject.lib;'),
+    )
+    if ext != '.exe':
+        link_opts.options['ModuleDefinitionFile'] = '$(SourceRootDir)src\\pyshellext\\pyshellext.def'
+
+
+    return CProject(f"pyshellext{ext.rpartition('.')[0]}",
+        VersionInfo(
+            FileDescription='Python shell extension',
+            OriginalFilename=f'pyshellext{ext}',
+        ),
+        ItemDefinition('ClCompile', LanguageStandard='stdcpp20'),
+        link_opts,
+        Manifest('default.manifest'),
+        CSourceFile('shellext.cpp'),
+        ResourceFile('pyshellext.rc'),
+        source='src/pyshellext',
+        StaticLibcppLinkage=True,
+        **props,
+    )
+
+
 PACKAGE = Package('python-manager',
     PyprojectTomlFile('pyproject.toml'),
     # MSIX manifest
-    File('src/pymanager/appxmanifest.xml', name='appxmanifest.xml'),
-    File('src/pymanager/pymanager.appinstaller', name='pymanager.appinstaller'),
+    File('src/pymanager/appxmanifest.xml'),
+    File('src/pymanager/pymanager.appinstaller'),
+    Package(
+        'MSIX.AppInstaller.Data',
+        File('src/pymanager/MSIXAppInstallerData.xml'),
+    ),
 
     # Default settings
     File('src/pymanager.json'),
@@ -146,34 +199,12 @@ def mainw_exe(name):
     Package(
         'templates',
         File('src/pymanager/templates/template.py'),
-        CProject('launcher',
-            VersionInfo(FileDescription="Python launcher", OriginalFilename="launcher.exe"),
-            CPP_SETTINGS,
-            Property('DynamicLibcppLinkage', 'true'),
-            ItemDefinition('ClCompile', RuntimeLibrary='MultiThreaded'),
-            ItemDefinition('Link', SubSystem='CONSOLE'),
-            Manifest('default.manifest'),
-            ResourceFile('pyicon.rc'),
-            CSourceFile('launcher.cpp'),
-            CSourceFile('_launch.cpp'),
-            IncludeFile('*.h'),
-            source='src/pymanager',
-            ConfigurationType='Application',
-        ),
-        CProject('launcherw',
-            VersionInfo(FileDescription="Python launcher (windowed)", OriginalFilename="launcherw.exe"),
-            CPP_SETTINGS,
-            Property('DynamicLibcppLinkage', 'true'),
-            ItemDefinition('ClCompile', RuntimeLibrary='MultiThreaded'),
-            ItemDefinition('Link', SubSystem='WINDOWS'),
-            Manifest('default.manifest'),
-            ResourceFile('pywicon.rc'),
-            CSourceFile('launcher.cpp'),
-            CSourceFile('_launch.cpp'),
-            IncludeFile('*.h'),
-            source='src/pymanager',
-            ConfigurationType='Application',
-        ),
+        launcher_exe("launcher-64", "x64", windowed=False),
+        launcher_exe("launcherw-64", "x64", windowed=True),
+        launcher_exe("launcher-arm64", "ARM64", windowed=False),
+        launcher_exe("launcherw-arm64", "ARM64", windowed=True),
+        launcher_exe("launcher-32", "Win32", windowed=False),
+        launcher_exe("launcherw-32", "Win32", windowed=True),
     ),
 
     # Directory for MSIX resources
@@ -202,6 +233,10 @@ def mainw_exe(name):
     mainw_exe("pythonw"),
     main_exe("python3"),
     mainw_exe("pythonw3"),
+
+    pyshellext(".exe", ConfigurationType="Application"),
+    pyshellext("-64.dll", Platform="x64"),
+    pyshellext("-arm64.dll", Platform="ARM64"),
 )
 
 
@@ -215,6 +250,9 @@ def get_commands():
         # Check if a subclass of BaseCommand
         if not any(b.id in command_bases for b in cls.bases):
             continue
+        # Ignore exec command - it gets handled separately.
+        if cls.name == "ExecCommand":
+            continue
         command_bases.add(cls.name)
         for a in filter(lambda s: isinstance(s, ast.Assign), cls.body):
             if not any(t.id == "CMD" for t in a.targets):
@@ -300,6 +338,7 @@ def init_METADATA():
     fileversion = _make_xyzw_version(METADATA["Version"], ",")
     for vi in PACKAGE.findall("**/VersionInfo"):
         vi.from_metadata(METADATA)
+        vi.options["LegalCopyright"] = "Copyright (c) Python Software Foundation. All Rights Reserved."
         vi.options["FILEVERSION"] = fileversion
 
 

_msbuild_test.py

@@ -50,6 +50,28 @@
         CFunction('date_as_str'),
         CFunction('datetime_as_str'),
         CFunction('reg_rename_key'),
+        CFunction('get_current_package'),
+        CFunction('read_alias_package'),
+        CFunction('broadcast_settings_change'),
         source='src/_native',
     ),
+    DllPackage('_shellext_test',
+        PyFile('_native/__init__.py'),
+        ItemDefinition('ClCompile',
+            PreprocessorDefinitions=Prepend("PYSHELLEXT_TEST=1;"),
+            LanguageStandard='stdcpp20',
+        ),
+        ItemDefinition('Link', AdditionalDependencies=Prepend("RuntimeObject.lib;")),
+        CSourceFile('pyshellext/shellext.cpp'),
+        CSourceFile('pyshellext/shellext_test.cpp'),
+        IncludeFile('pyshellext/shellext.h'),
+        CSourceFile('_native/helpers.cpp'),
+        IncludeFile('_native/helpers.h'),
+        CFunction('shellext_RegReadStr'),
+        CFunction('shellext_ReadIdleInstalls'),
+        CFunction('shellext_ReadAllIdleInstalls'),
+        CFunction('shellext_PassthroughTitle'),
+        CFunction('shellext_IdleCommand'),
+        source='src',
+    )
 )