Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ Python version and distribution:

pywin32 version:

Installed from PyPI or exe installer:

Windows Version:
<!-- You can find this under "System Information", ie: Version 10.0.19045 Build 19045 -->

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ jobs:
python setup.py bdist_wheel --skip-build

- uses: actions/upload-artifact@v3
# Upload artifacts even if tests fail
if: ${{ always() }}
with:
name: artifacts
path: |
dist/*.whl
dist/*.exe
path: dist/*.whl

# We cannot build and test on ARM64, so we cross-compile.
# Later, when available, we can add tests using this wheel on ARM64 VMs
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ MANIFEST
build
dist
__pycache__
*.exe
*.zip
*.dbg
*.exp
Expand Down
21 changes: 6 additions & 15 deletions Pythonwin/pywin/framework/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import os
import sys
import traceback
import warnings
from typing import TYPE_CHECKING

import regutil
Expand Down Expand Up @@ -344,27 +345,17 @@ def OnInitDialog(self):
win32ui.copyright, sys.copyright, scintilla, idle, contributors
)
self.SetDlgItemText(win32ui.IDC_EDIT1, text)
# Get the build number - written by installers.
# For distutils build, read pywin32.version.txt
import sysconfig

site_packages = sysconfig.get_paths()["platlib"]
version_path = os.path.join(site_packages, "pywin32.version.txt")
try:
build_no = (
open(os.path.join(site_packages, "pywin32.version.txt")).read().strip()
)
ver = "pywin32 build %s" % build_no
with open(version_path) as f:
ver = "pywin32 build %s" % f.read().strip()
except OSError:
ver = None
if ver is None:
# See if we are Part of Active Python
ver = _GetRegistryValue(
"SOFTWARE\\ActiveState\\ActivePython", "CurrentVersion"
)
if ver is not None:
ver = f"ActivePython build {ver}"
if ver is None:
ver = ""
if not ver:
warnings.warn(f"Could not read pywin32's version from '{version_path}'")
self.SetDlgItemText(win32ui.IDC_ABOUT_VERSION, ver)
self.HookCommand(self.OnButHomePage, win32ui.IDC_BUTTON1)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ See [CHANGES.txt](https://github.com/mhammond/pywin32/blob/master/CHANGES.txt) f
## Docs

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

## Support
Expand Down
3 changes: 1 addition & 2 deletions com/win32com/server/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -523,11 +523,10 @@ def UnregisterClasses(*classes, **flags):
extra()


#
# Unregister info is for installers or external uninstallers.
# The WISE installer, for example firstly registers the COM server,
# then queries for the Unregister info, appending it to its
# install log. Uninstalling the package will the uninstall the server
# install log. Uninstalling the package will uninstall the server.
def UnregisterInfoClasses(*classes, **flags):
ret = []
for cls in classes:
Expand Down
11 changes: 0 additions & 11 deletions make_all.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,21 @@ rem Now the binaries.

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

rem (bdist_wininst needs --target-version to name the installers correctly!)
py -3.8-32 setup.py -q bdist_wininst --skip-build --target-version=3.8
py -3.8-32 setup.py -q bdist_wheel --skip-build
py -3.8 setup.py -q bdist_wininst --skip-build --target-version=3.8
py -3.8 setup.py -q bdist_wheel --skip-build

py -3.9-32 setup.py -q bdist_wininst --skip-build --target-version=3.9
py -3.9-32 setup.py -q bdist_wheel --skip-build
py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.9
py -3.9 setup.py -q bdist_wheel --skip-build

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

py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.11
py -3.11-32 setup.py -q bdist_wheel --skip-build
py -3.11 setup.py -q bdist_wheel --skip-build

py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.12
py -3.12-32 setup.py -q bdist_wheel --skip-build
py -3.12 setup.py -q bdist_wheel --skip-build

py -3.9 setup.py -q bdist_wininst --skip-build --target-version=3.13
py -3.13-32 setup.py -q bdist_wheel --skip-build
py -3.13 setup.py -q bdist_wheel --skip-build

Expand Down
Loading