Merge branch 'release-prep'

wxWidgets · Aug 8, 2022 · e220dab · e220dab
2 parents b33b012 + 1ecff8a
commit e220dab
Show file tree

Hide file tree

Showing 10 changed files with 701 additions and 257 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,7 +10,7 @@ wxPython Changelog
 
 4.2.0 "Rumors of my death are only slightly exaggerated"
 --------------------------------------------------------
-* (unreleased)
+* 7-Aug-2022
 
 PyPI:   https://pypi.python.org/pypi/wxPython/4.2.0
 Extras: https://extras.wxPython.org/wxPython4/extras/
@@ -42,14 +42,14 @@ New and improved in this release:
   Python environment used for the build. A dependency has been added to
   requirements/devel.txt to help ensure that the correct version is installed.
   The wx.siplib module code is no longer kept in the repository, but is
-  generated during build.
+  generated during the build.
 
 * Changed wx.App.InitLocale to just do `locale.setlocale(locale.LC_ALL, "C")`
   to undo what Python (3.8+ on Windows) does. This lets wxWidgets start with an
   uninitialized locale as it expects. (#1637)
 
-* Fixed issues related to `time_t` being treated as a 32-bit value on Windows.
-  (#1910)
+* Fixed issues related to `time_t` always being treated as a 32-bit value on
+  Windows. (#1910)
 
 * Added wx.FullScreenEvent and wx.EVT_FULLSCREEN.
 
@@ -69,7 +69,7 @@ New and improved in this release:
   the display density. Existing code should be able to continue to pass a
   wx.Bitmap to the widget constructor or to methods like SetBitmap, as wxPython
   will automatically convert from a wx.Bitmap to a wx.BitmapBundle containing
-  the single image where it is needed.
+  the single image provided.
 
 * Add support for new wx.grid event, EVT_GRID_ROW_MOVE
 
@@ -108,7 +108,8 @@ New and improved in this release:
 * IntCtrl: Change default colour to wx.NullColour so the default color will be
   used. (#2215)
 
-* Change PopupControl to respect all the parameters passed to it's init (#2218)
+* Change PopupControl to respect all the parameters passed to its init method.
+  (#2218)
 
 * Fixes in flatmenu.py Remove and DestroyItem (#2219)
 

diff --git a/build.py b/build.py
@@ -89,8 +89,8 @@
 
 # Some tools will be downloaded for the builds. These are the versions and
 # MD5s of the tool binaries currently in use.
-wafCurrentVersion = '2.0.22'
-wafMD5 = 'f2e5880ba4ecd06f7991181bdba1138b'
+wafCurrentVersion = '2.0.24'
+wafMD5 = '698f382cca34a08323670f34830325c4'
 
 doxygenCurrentVersion = '1.8.8'
 doxygenMD5 = {

diff --git a/buildtools/version.py b/buildtools/version.py
@@ -24,7 +24,7 @@
 # version numbers.
 VER_MAJOR        = 4
 VER_MINOR        = 2
-VER_RELEASE      = 0
+VER_RELEASE      = 1
 
 VER_FLAGS        = "a1"     # wxPython release flags
 

diff --git a/docker/build/rocky-8/Dockerfile b/docker/build/rocky-8/Dockerfile
@@ -0,0 +1,67 @@
+# The base image
+FROM rockylinux:8
+
+# Set environment variables
+ENV DIST_NAME=rocky-8
+ENV USER=wxpy
+ENV HOME=/home/$USER
+ENV PYTHONUNBUFFERED=1
+ENV PATH=$HOME/bin:$PATH
+ENV GTK2_OK=no
+
+
+# Update and install basic OS packages
+RUN \
+#        yum -y install https://centos8.iuscommunity.org/ius-release.rpm; \
+#        yum install \
+#               https://repo.ius.io/ius-release-el8.rpm \
+#               https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \
+#        dnf config-manager --set-enabled PowerTools; \
+        yum -y update; \
+        yum -y group install development; \
+        yum -y install sudo nano which; \
+# Set up a user, and etc.
+        mkdir -p /dist; \
+        adduser -m ${USER}; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
+# Install development packages needed for building wxPython
+        yum -y install \
+                freeglut-devel \
+                gstreamer1-devel \
+                gstreamer1-plugins-base-devel \
+                gtk3-devel \
+                libjpeg-turbo-devel \
+                libnotify \
+                libnotify-devel \
+                libpng-devel \
+                libSM-devel \
+                libtiff-devel \
+                libXtst-devel \
+                SDL-devel \
+                webkit2gtk3-devel; \
+# Install all available Python packages and their dev packages
+        yum -y install python3 python3-tools python3-devel; \
+        yum -y install python38  python38-devel; \
+        yum -y install python39  python39-devel; \
+# Clean up the yum caches
+        yum clean all;
+
+# Set the user and group to use for the rest of the commands
+USER ${USER}:${USER}
+
+# Set the working directory
+WORKDIR ${HOME}
+
+# Create virtual environments for each Python
+RUN \
+        cd ${HOME}; \
+        mkdir -p ${HOME}/venvs; \
+        python3.8 -m venv venvs/Py38; \
+        python3.9 -m venv venvs/Py39;
+
+# Add files from host into the container
+COPY scripts ${HOME}/bin
+
+# Define default command
+CMD ["/bin/bash", "-l"]
+
diff --git a/docker/build/rocky-9/Dockerfile b/docker/build/rocky-9/Dockerfile
@@ -0,0 +1,64 @@
+# The base image
+FROM rockylinux:9
+
+# Set environment variables
+ENV DIST_NAME=rocky-9
+ENV USER=wxpy
+ENV HOME=/home/$USER
+ENV PYTHONUNBUFFERED=1
+ENV PATH=$HOME/bin:$PATH
+ENV GTK2_OK=no
+
+
+# Update and install basic OS packages
+RUN \
+#        yum -y install https://centos8.iuscommunity.org/ius-release.rpm; \
+#        yum install \
+#               https://repo.ius.io/ius-release-el8.rpm \
+#               https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \
+#        dnf config-manager --set-enabled PowerTools; \
+        yum -y update; \
+        yum -y group install development; \
+        yum -y install sudo nano which; \
+# Set up a user, and etc.
+        mkdir -p /dist; \
+        adduser -m ${USER}; \
+        echo "${USER} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
+# Install development packages needed for building wxPython
+        yum -y install \
+                freeglut \
+                gstreamer1-devel \
+                gstreamer1-plugins-base-devel \
+                gtk3-devel \
+                libjpeg-turbo-devel \
+                libnotify \
+                libnotify-devel \
+                libpng-devel \
+                libSM-devel \
+                libtiff-devel \
+                libXtst-devel \
+                SDL2-devel \
+                webkit2gtk3-devel; \
+# Install all available Python packages and their dev packages
+        yum -y install python3 python3-devel; \
+# Clean up the yum caches
+        yum clean all;
+
+# Set the user and group to use for the rest of the commands
+USER ${USER}:${USER}
+
+# Set the working directory
+WORKDIR ${HOME}
+
+# Create virtual environments for each Python
+RUN \
+        cd ${HOME}; \
+        mkdir -p ${HOME}/venvs; \
+        python3.9 -m venv venvs/Py39;
+
+# Add files from host into the container
+COPY scripts ${HOME}/bin
+
+# Define default command
+CMD ["/bin/bash", "-l"]
+
diff --git a/docker/tasks.py b/docker/tasks.py
@@ -29,6 +29,8 @@
         'fedora-31',
         'fedora-32',
         'fedora-33',
+        'centos-7',
+        'centos-8',
         ]