Commit Graph

121 Commits

Author SHA1 Message Date
Edouard Choinière
7819799d0d Sort almost all usages of glob.glob for reproducible output
This will help diff-ing logs between invocations to see what is changing when refactoring. When used for creating an archive, it will help creating a reproducible file.
2025-01-28 03:28:11 +00:00
Edouard Choinière
e56e248767 Remove attrdict3 build dependency and use plain dict 2025-01-18 23:34:11 +00:00
Kazuya O'moto
0da5a0bd5c Modify import from setuptools.modified 2024-09-11 01:51:09 +09:00
Kazuya O'moto
3af6625242 Don't warn unclosed file with subprocess.Popen
https://docs.python.org/3/library/subprocess.html#popen-constructor
> Changed in version 3.2: Added context manager support.
> Changed in version 3.6: Popen destructor now emits a ResourceWarning warning if the child process is still running.
2024-09-07 01:39:32 +09:00
Kazuya O'moto
45d50d4553 Don't warn build process with distutils
Porting from Distutils:
Change distutils.dep_util --> setuptools.modified.
https://setuptools.pypa.io/en/latest/deprecated/distutils-legacy.html
https://peps.python.org/pep-0632/
2024-09-07 01:39:25 +09:00
Robin Dunn
f56d65daaa Migrate CI from Azure Pipelines to GitHub Actions
Some checks are pending
ci-build / build-source-dist (push) Waiting to run
ci-build / build-wheels (x64, macos-13, 3.10) (push) Blocked by required conditions
ci-build / build-wheels (x64, macos-13, 3.11) (push) Blocked by required conditions
ci-build / build-wheels (x64, macos-13, 3.12) (push) Blocked by required conditions
ci-build / build-wheels (x64, macos-13, 3.13-dev) (push) Blocked by required conditions
ci-build / build-wheels (x64, macos-13, 3.8) (push) Blocked by required conditions
ci-build / build-wheels (x64, macos-13, 3.9) (push) Blocked by required conditions
ci-build / build-wheels (x64, ubuntu-22.04, 3.10) (push) Blocked by required conditions
ci-build / build-wheels (x64, ubuntu-22.04, 3.11) (push) Blocked by required conditions
ci-build / build-wheels (x64, ubuntu-22.04, 3.12) (push) Blocked by required conditions
ci-build / build-wheels (x64, ubuntu-22.04, 3.13-dev) (push) Blocked by required conditions
ci-build / build-wheels (x64, ubuntu-22.04, 3.8) (push) Blocked by required conditions
ci-build / build-wheels (x64, ubuntu-22.04, 3.9) (push) Blocked by required conditions
ci-build / build-wheels (x64, windows-2022, 3.10) (push) Blocked by required conditions
ci-build / build-wheels (x64, windows-2022, 3.11) (push) Blocked by required conditions
ci-build / build-wheels (x64, windows-2022, 3.12) (push) Blocked by required conditions
ci-build / build-wheels (x64, windows-2022, 3.13-dev) (push) Blocked by required conditions
ci-build / build-wheels (x64, windows-2022, 3.8) (push) Blocked by required conditions
ci-build / build-wheels (x64, windows-2022, 3.9) (push) Blocked by required conditions
ci-build / build-wheels (x86, windows-2022, 3.10) (push) Blocked by required conditions
ci-build / build-wheels (x86, windows-2022, 3.11) (push) Blocked by required conditions
ci-build / build-wheels (x86, windows-2022, 3.12) (push) Blocked by required conditions
ci-build / build-wheels (x86, windows-2022, 3.13-dev) (push) Blocked by required conditions
ci-build / build-wheels (x86, windows-2022, 3.8) (push) Blocked by required conditions
ci-build / build-wheels (x86, windows-2022, 3.9) (push) Blocked by required conditions
* Add --quiet option

* First pass on github workflow for CI

* Comment out the 2nd job for now

* Changes and tweaks from what I learned in a test project

* We also need to run the dox command

* Set PYTHONUNBUFFERED in the workflow

* Copy sip.h when the siplib is (re)created, instead of later during the build

* generate version modules in cmd_sdist too

* More fixes for building an sdist in a clean folder

* install gettext

* sudo

* Add build-wheels job

* add apt update

* Explicitly install libunwind-dev to workaround a package dependency bug

* Split the generate and the sdist step into 2 steps.

* fixes for building sdist on Windows, and also enable some additional MSVC info when building

* Use ilammy/msvc-dev-cmd to set up MSVC

* Comment out some no longer needed debug prints

* Add remaining matrix entries

* Uninstall wxPython at the end of the test, turn off fail-fast.

* uninstall --yes

* Add builds for Python 3.12 and 3.13

* Pin setuptools to < 74 on Windows due to removal of setuptools.msvc

* Remove Azure pipelines

* Try building on macOS x86 (not ARM)

* Update actions versions to non-deprecated ones

* Use macOS 13 (-large images seem to not be available on free accounts)

* avoid using -latest to avoid surprises later

* fix typo

* Remove checkout step from matrix (shouldn't be needed?)

* Revert "Remove checkout step from matrix (shouldn't be needed?)"

This reverts commit 385ef5c832.

---------

Co-authored-by: Scott Talbert <swt@techie.net>
2024-09-01 10:06:02 -04:00
Scott Talbert
fd8781c97a Update sip to v6.8.5 2024-07-07 16:42:10 -04:00
Scott Talbert
2c6307142f Update sip to v6.8.3 and fix deprecations 2024-02-12 23:20:17 -05:00
Robin Dunn
a5480e537d Py 3.12 syntax fix 2023-05-31 17:31:02 -07:00
Scott Talbert
2e9169effa Only require attrdict3 on Windows
It's only used on Windows, so only require it there.
2022-08-08 20:00:52 -04:00
Markus Mützel
a8f74c5d32 Simplify building with MinGW toolchain
Add a waf option `--no_msvc` that switches from a MSVC toolchain to a MinGW toolchain on Windows.
2022-07-11 19:14:22 +02:00
Robin Dunn
7413837833 Since we've already set everything we need in the environment set DISTUTILS_USE_SDK so distutils won't try to do it all again. 2022-05-16 22:37:02 -07:00
Robin Dunn
d8a07a78a4 Docstring clarification 2022-05-16 10:10:01 -07:00
Robin Dunn
3038b2e916 Use 14.0 as the minimum MSVC version 2022-05-16 10:04:44 -07:00
Robin Dunn
685b9af718 Move setting the environment variables into getMSVCInfo 2022-05-15 10:40:51 -07:00
Robin Dunn
cadd91697c Switch to setuptools.msvc for getting setup info for the Windows compiler, reducing dependence on distutils. 2022-05-14 20:31:11 -07:00
Robin Dunn
9627bb8035 Merge branch 'master' into update-wx 2021-12-13 21:40:18 -08:00
Robin Dunn
332a70cc34 traverse flags in the reverse order so they end up in the same relative order when done 2021-11-30 15:41:04 -08:00
Christian Clauss
25ba122168 Fix typos discovered by codespell 2021-08-07 18:55:49 +02:00
Robin Dunn
224630cf64 Add Config.SIP_TRACE flag 2021-01-07 13:43:11 -08:00
Robin Dunn
c385873d70 Add SIP_ABI to the config object 2021-01-05 11:11:26 -08:00
Robin Dunn
c8e25b79e1 Run SIP via its Python interface rather than as a separate subprocess 2021-01-05 11:01:25 -08:00
Robin Dunn
201228c529 Improve code to use the same CC and CXX as wxWidgets, including flags that may be added on to wx's CC/CXX. 2020-12-01 16:19:38 -08:00
Robin Dunn
7a05d20d82 Merge pull request #1572 from pbrod/Fix_issue1571
Fixes issue 1571:
2020-03-23 16:07:22 -07:00
Robin Dunn
52c00542eb Streamline fetching WX_CONFIG from the environment 2020-03-23 14:50:52 -07:00
Per A. Brodtkorb
e4e8bf8317 Fixes issue 1571:
Adding missing close for open.
If the "close()" call is missing after a "open(filename)" call, the filename isn't guaranteed to be closed before the interpreter exits.
This is generally a bad practice as explained here: https://stackoverflow.com/questions/7395542/is-explicitly-closing-files-important

Also replaced "fid=open(filename) fid.close()" statements for files with the safer
"with open(filename) as fid:" blocks. See https://www.python.org/dev/peps/pep-0343/
2020-03-23 17:16:44 +01:00
Robin Dunn
9b122237c9 if WX_CONFIG is set in the environment then use that instead of defaulting to "wx-config" 2020-03-20 15:25:34 -07:00
Robin Dunn
9f2cc54b48 Update copyright years 2020-03-10 11:41:39 -07:00
Robin Dunn
e7fbe980e1 Use the dpi-aware manifest, if the compiler is new enough to be able to use it. 2019-12-17 19:42:27 -08:00
Robin Dunn
10cd50b68d Ensure setup.h was found before trying to open it 2019-08-21 16:46:26 -07:00
Robin Dunn
98ea1d87f4 Include SIP's license file too 2019-06-28 12:55:05 -07:00
Robin Dunn
03ee6dcd95 Python 2.7 doesn't have TemporaryDirectory
(cherry picked from commit ef81730d8a)
2019-06-22 19:23:27 -07:00
Robin Dunn
6dab1307fa Add option to regenerate sysconfig in broken build environments.
Also add option to print waf's config.log on error.

(cherry picked from commit a2f6c4b402)
2019-06-22 19:23:27 -07:00
Robin Dunn
e234a65cd7 Use textwrap3 on Python 2 2019-05-31 08:57:15 -07:00
Robin Dunn
23fe71ff6d Restore always trying to build the msg catalogs, and
remove the source .mo file when done copying it. (Because they're not committed to wxWidgets repo anymore.)
2019-05-28 14:50:06 -07:00
Robin Dunn
ff1d5402a1 Python 2.7 doesn't have indent 2019-05-27 22:51:53 -07:00
Robin Dunn
40e5ce8bc4 Merge pull request #1208 from RobinD42/some-build-fixes
Enable wxPython's build to check results of wxWidgets configuration

(cherry picked from commit a6f6fff928)
2019-04-17 18:33:16 -07:00
Robin Dunn
e9e3736fa0 Merge pull request #1035 from RobinD42/fix-issue961
include wxpy_api.h

(cherry picked from commit 7300aa4718)
2018-10-11 21:15:10 -07:00
Robin Dunn
ac1a323144 Merge pull request #1026 from RobinD42/sip-4.19.13
Switch to SIP 4.19.13

(cherry picked from commit a268da9b84)
2018-10-03 19:25:45 -07:00
Robin Dunn
f418dde5d8 Merge pull request #893 from RobinD42/fix-darwin-linking
Fix darwin linking
(cherry picked from commit de143e9d83)
2018-06-22 22:46:44 -07:00
Robin Dunn
b77c88a280 Merge tag 'wxPython-4.0.2' into wxPy-4.0.x
(cherry picked from commit 4c56c39e52)
2018-06-17 22:04:22 -07:00
Robin Dunn
a62f26450d Set the length of the revision ID to be output from rev-parse 2018-04-30 23:05:02 -07:00
Tim S
528884e914 fix bugs or issues not related to MSys2 2017-12-12 19:17:10 -05:00
Robin Dunn
dba1c6f159 Use "snapshot" instead of the revision text, that's already in the version number.
Also, spell out "development"
2017-09-27 17:31:36 -07:00
Robin Dunn
541c4882da Add an item to wx.PlatformInfo and wx.__version__ indicating build type:
Development, snapshot or release
2017-09-27 17:25:37 -07:00
Robin Dunn
4c78aa6c12 Use separate build folders for wxPython too 2017-08-14 16:12:40 -07:00
Robin Dunn
0879cdc240 Ensure that the locale message catalogs are included in the source and binary archives. 2017-08-11 15:46:04 -07:00
Robin Dunn
1bcde3d6fd Combine preamble, wxWindows license and LGPL files into a single LICENSE.txt file 2017-06-23 13:36:23 -07:00
Robin Dunn
e5b4c33421 (re)fetch the license files from wxWidgets when building the sdist,
and ensure it is included in the distribution.
2017-06-23 12:10:23 -07:00
Robin Dunn
a15b153200 Fixes needed due to unsyncing the wxW/wxPy version numbers 2017-04-08 10:49:30 -07:00