Skip to content

Commit d4a92be

Browse files
committed
Removing EXE binary installers code paths
1 parent c6acaf5 commit d4a92be

9 files changed

Lines changed: 117 additions & 246 deletions

File tree

.github/issue_template.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Python version and distribution:
2626

2727
pywin32 version:
2828

29-
Installed from PyPI or exe installer:
30-
3129
Windows Version:
3230
<!-- You can find this under "System Information", ie: Version 10.0.19045 Build 19045 -->
3331

.github/workflows/main.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ jobs:
5353
python setup.py bdist_wheel --skip-build
5454
5555
- uses: actions/upload-artifact@v3
56+
# Upload artefacts even if tests fail
5657
if: ${{ always() }}
5758
with:
5859
name: artifacts
59-
path: |
60-
dist/*.whl
61-
dist/*.exe
60+
path: dist/*.whl
6261

6362
# We cannot build and test on ARM64, so we cross-compile.
6463
# Later, when available, we can add tests using this wheel on ARM64 VMs

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ MANIFEST
22
build
33
dist
44
__pycache__
5-
*.exe
65
*.zip
76
*.dbg
87
*.exp

Pythonwin/pywin/framework/app.py

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import os
77
import sys
88
import traceback
9+
import warnings
910

1011
import regutil
1112
import win32api
@@ -338,27 +339,17 @@ def OnInitDialog(self):
338339
win32ui.copyright, sys.copyright, scintilla, idle, contributors
339340
)
340341
self.SetDlgItemText(win32ui.IDC_EDIT1, text)
341-
# Get the build number - written by installers.
342-
# For distutils build, read pywin32.version.txt
343342
import sysconfig
344343

345344
site_packages = sysconfig.get_paths()["platlib"]
345+
version_path = os.path.join(site_packages, "pywin32.version.txt")
346346
try:
347-
build_no = (
348-
open(os.path.join(site_packages, "pywin32.version.txt")).read().strip()
349-
)
350-
ver = "pywin32 build %s" % build_no
347+
with open(version_path) as f:
348+
ver = "pywin32 build %s" % f.read().strip()
351349
except OSError:
352350
ver = None
353-
if ver is None:
354-
# See if we are Part of Active Python
355-
ver = _GetRegistryValue(
356-
"SOFTWARE\\ActiveState\\ActivePython", "CurrentVersion"
357-
)
358-
if ver is not None:
359-
ver = f"ActivePython build {ver}"
360-
if ver is None:
361-
ver = ""
351+
if not ver:
352+
warnings.warn(f"Could not read pywin32's version from '{version_path}'")
362353
self.SetDlgItemText(win32ui.IDC_ABOUT_VERSION, ver)
363354
self.HookCommand(self.OnButHomePage, win32ui.IDC_BUTTON1)
364355

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ See [CHANGES.txt](https://github.com/mhammond/pywin32/blob/master/CHANGES.txt) f
1515
## Docs
1616

1717
The docs are a long and sad story, but [there's now an online version](https://mhammond.github.io/pywin32/)
18-
of the helpfile that ships with the installers (thanks [@ofek](https://github.com/mhammond/pywin32/pull/1774)!).
18+
of the `PyWin32.chm` helpfile (thanks [@ofek](https://github.com/mhammond/pywin32/pull/1774)!).
1919
Lots of that is very old, but some is auto-generated and current. Would love help untangling the docs!
2020

2121
## Support

com/win32com/server/register.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,11 +523,10 @@ def UnregisterClasses(*classes, **flags):
523523
extra()
524524

525525

526-
#
527526
# Unregister info is for installers or external uninstallers.
528527
# The WISE installer, for example firstly registers the COM server,
529528
# then queries for the Unregister info, appending it to its
530-
# install log. Uninstalling the package will the uninstall the server
529+
# install log. Uninstalling the package will uninstall the server.
531530
def UnregisterInfoClasses(*classes, **flags):
532531
ret = []
533532
for cls in classes:

make_all.bat

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,24 @@ rem Now the binaries.
1212

1313
rem Check /build_env.md#build-environment to make sure you have all the required components installed
1414

15-
rem (bdist_wininst needs --target-version to name the installers correctly!)
16-
py -3.7-32 setup.py -q bdist_wininst --skip-build --target-version=3.7
1715
py -3.7-32 setup.py -q bdist_wheel --skip-build
18-
py -3.7 setup.py -q bdist_wininst --skip-build --target-version=3.7
1916
py -3.7 setup.py -q bdist_wheel --skip-build
2017

21-
py -3.8-32 setup.py -q bdist_wininst --skip-build --target-version=3.8
2218
py -3.8-32 setup.py -q bdist_wheel --skip-build
23-
py -3.8 setup.py -q bdist_wininst --skip-build --target-version=3.8
2419
py -3.8 setup.py -q bdist_wheel --skip-build
2520

26-
py -3.9-32 setup.py -q bdist_wininst --skip-build --target-version=3.9
2721
py -3.9-32 setup.py -q bdist_wheel --skip-build
28-
py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.9
2922
py -3.9 setup.py -q bdist_wheel --skip-build
3023

31-
rem 3.10 stopped supporting bdist_wininst, but we can still build them with 3.9
32-
rem (but 32bit builds seem broken doing this :( #1805)
33-
py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.10
3424
py -3.10-32 setup.py -q bdist_wheel --skip-build
3525
py -3.10 setup.py -q bdist_wheel --skip-build
3626

37-
py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.11
3827
py -3.11-32 setup.py -q bdist_wheel --skip-build
3928
py -3.11 setup.py -q bdist_wheel --skip-build
4029

41-
py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.12
4230
py -3.12-32 setup.py -q bdist_wheel --skip-build
4331
py -3.12 setup.py -q bdist_wheel --skip-build
4432

45-
py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.13
4633
py -3.13-32 setup.py -q bdist_wheel --skip-build
4734
py -3.13 setup.py -q bdist_wheel --skip-build
4835

0 commit comments

Comments
 (0)