From 34174cc20e184e473c845c46801d1525ecc4d0e0 Mon Sep 17 00:00:00 2001 From: Pieter De Praetere Date: Mon, 20 Nov 2017 09:15:51 +0100 Subject: [PATCH 1/3] Small typo: rouge instead of rogue --- docs/configuration-directives/WSGIDaemonProcess.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration-directives/WSGIDaemonProcess.rst b/docs/configuration-directives/WSGIDaemonProcess.rst index f6cb2b12..aaa4ee98 100644 --- a/docs/configuration-directives/WSGIDaemonProcess.rst +++ b/docs/configuration-directives/WSGIDaemonProcess.rst @@ -327,7 +327,7 @@ Options which can be supplied to the ``WSGIDaemonProcess`` directive are: the Python GIL has been detected. The default is 300 seconds. This option exists to combat the problem of a daemon process freezing - as the result of a rouge Python C extension module which doesn't + as the result of a rogue Python C extension module which doesn't properly release the Python GIL when entering into a blocking or long running operation. From cc74fe2b8f93fd337ee3da92ae86c840b188972d Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Wed, 13 Dec 2017 10:22:45 +1100 Subject: [PATCH 2/3] Increment version to 4.5.23. --- docs/release-notes.rst | 1 + docs/release-notes/version-4.5.23.rst | 7 +++++++ src/server/wsgi_version.h | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 docs/release-notes/version-4.5.23.rst diff --git a/docs/release-notes.rst b/docs/release-notes.rst index a60bd7af..93989764 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -5,6 +5,7 @@ Release Notes .. toctree:: :maxdepth: 2 + release-notes/version-4.5.23 release-notes/version-4.5.22 release-notes/version-4.5.21 release-notes/version-4.5.20 diff --git a/docs/release-notes/version-4.5.23.rst b/docs/release-notes/version-4.5.23.rst new file mode 100644 index 00000000..13ba0343 --- /dev/null +++ b/docs/release-notes/version-4.5.23.rst @@ -0,0 +1,7 @@ +============== +Version 4.5.23 +============== + +Version 4.5.23 of mod_wsgi can be obtained from: + + https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.23 diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h index ddc42709..2d75fae3 100755 --- a/src/server/wsgi_version.h +++ b/src/server/wsgi_version.h @@ -25,8 +25,8 @@ #define MOD_WSGI_MAJORVERSION_NUMBER 4 #define MOD_WSGI_MINORVERSION_NUMBER 5 -#define MOD_WSGI_MICROVERSION_NUMBER 22 -#define MOD_WSGI_VERSION_STRING "4.5.22" +#define MOD_WSGI_MICROVERSION_NUMBER 23 +#define MOD_WSGI_VERSION_STRING "4.5.23" /* ------------------------------------------------------------------------- */ From df07ce977a3ae17f5d7df898fb74fe402161eb08 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Wed, 13 Dec 2017 10:29:02 +1100 Subject: [PATCH 3/3] Incorrect check around whether apxs present. --- docs/release-notes/version-4.5.23.rst | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-4.5.23.rst b/docs/release-notes/version-4.5.23.rst index 13ba0343..9a2a04e0 100644 --- a/docs/release-notes/version-4.5.23.rst +++ b/docs/release-notes/version-4.5.23.rst @@ -5,3 +5,10 @@ Version 4.5.23 Version 4.5.23 of mod_wsgi can be obtained from: https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.23 + +Bugs Fixed +---------- + +* Incorrect check around whether ``apxs`` was present on system would result + in ``pip`` install failing on Windows, and possibly also when using + latest Xcode on MacOS X. diff --git a/setup.py b/setup.py index f0c92b5e..1f4a8ad5 100644 --- a/setup.py +++ b/setup.py @@ -161,7 +161,7 @@ def find_program(names, default=None, paths=[]): elif WITHOUT_APXS and sys.platform == 'darwin': WITH_MACOSX_APACHE = '/Applications/Xcode.app' -if WITHOUT_APXS and not WITH_WINDOWS_APACHE and not WITHOUT_APXS: +if WITHOUT_APXS and not WITH_WINDOWS_APACHE and not WITH_MACOSX_APACHE: raise RuntimeError('The %r command appears not to be installed or ' 'is not executable. Please check the list of prerequisites ' 'in the documentation for this package and install any '