diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f592fbc..884be43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,9 +9,9 @@ on: - # cron (in UTC): minute hour day_of_month month day_of_week cron: '00 02 * * SUN' push: - branches: [ master ] + branches: [ master, stable_0.5 ] pull_request: - branches: [ master ] + branches: [ master, stable_0.5 ] jobs: diff --git a/docs/changes.rst b/docs/changes.rst index 739074b..4ccc671 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -5,9 +5,9 @@ Change log ========== -syslog2 0.5.0.dev1 ------------------- +syslog2 0.5.0 +------------- -Released: 2022-mm-dd +Released: 2022-09-05 Initial version diff --git a/minimum-constraints.txt b/minimum-constraints.txt index 945c369..1ff42b5 100644 --- a/minimum-constraints.txt +++ b/minimum-constraints.txt @@ -76,12 +76,13 @@ # pip 10.0.0 introduced the --exclude-editable option. # Pip 20.2 introduced a new resolver whose backtracking had issues that were resolved only in 21.2.2. # pip>=21.0 is needed for the cryptography package on Windows on GitHub Actions. +# setuptools 49.1.3 or 49.2.0 is needed on py310 pip==10.0.1; python_version <= '3.5' pip==21.2.2; python_version >= '3.6' setuptools==39.0.1; python_version <= '3.6' setuptools==40.6.0; python_version == '3.7' setuptools==41.5.0; python_version >= '3.8' and python_version <= '3.9' -setuptools==49.0.0; python_version >= '3.10' +setuptools==49.2.0; python_version >= '3.10' wheel==0.30.0; python_version <= '3.6' wheel==0.32.0; python_version == '3.7' wheel==0.33.5; python_version >= '3.8' @@ -94,10 +95,8 @@ pytz==2019.1 macos_oslog==0.5.0; sys_platform=='darwin' -pywin32==222; sys_platform == 'win32' and python_version == '2.7' -pywin32==222; sys_platform == 'win32' and python_version >= '3.5' and python_version <= '3.6' -pywin32==223; sys_platform == 'win32' and python_version == '3.7' -pywin32==227; sys_platform == 'win32' and python_version >= '3.8' and python_version != '3.10' +pywin32==228; sys_platform == 'win32' and python_version <= '3.9' +pywin32==302; sys_platform == 'win32' and python_version >= '3.10' # Indirect dependencies for installation (must be consistent with requirements.txt, if present) diff --git a/requirements.txt b/requirements.txt index 15a52fe..c4f88d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,19 +21,9 @@ pytz>=2019.1 macos_oslog>=0.5.0; sys_platform=='darwin' and python_version >= '3.5' # There is no version of pywin32 for py34. -# Pywin32 version 222 is inconsistent in its 32-bit/64-bit support on py37 -# Pywin32 version 226 needs to be excluded, see issues #1946 and #1975. -# Issue #2675: Pywin32 version 225+ provides wheel files for py38, but does not -# advertise py38 on Pypi. That causes pywin32==225 to fail but pywin32>=225 -# to work. -# Reported to pywin32 as https://github.com/mhammond/pywin32/issues/1448. -# Addressed by increasing the minimum version of pywin32 to >=227 on Python >=3.8. -# TODO: To circumvent https://github.com/pypa/pip/issues/10701, we exclude -# py3.10. Remove the circumvention once fixed. -pywin32>=222,!=226; sys_platform == 'win32' and python_version == '2.7' -pywin32>=222,!=226; sys_platform == 'win32' and python_version >= '3.5' and python_version <= '3.6' -pywin32>=223,!=226; sys_platform == 'win32' and python_version == '3.7' -pywin32>=227; sys_platform == 'win32' and python_version >= '3.8' and python_version != '3.10' +# Pywin32 version 227 (or so) is needed for using the win32evtlog module. +pywin32>=228; sys_platform == 'win32' and python_version <= '3.9' +pywin32>=302; sys_platform == 'win32' and python_version >= '3.10' # Indirect dependencies are not specified in this file. diff --git a/syslog2/_syslog2.py b/syslog2/_syslog2.py index 8b15365..0b5a63f 100644 --- a/syslog2/_syslog2.py +++ b/syslog2/_syslog2.py @@ -34,19 +34,19 @@ import pytz # Determine the current operating system platform -_system = platform.system() -if _system == 'Linux': +_SYSTEM = platform.system() +if _SYSTEM == 'Linux': _PLATFORM = 'linux' -elif _system == 'Darwin': # macOS +elif _SYSTEM == 'Darwin': # macOS if tuple(map(int, platform.mac_ver()[0].split('.'))) >= (10, 12): _PLATFORM = 'macos_unified' # unified logging system else: _PLATFORM = 'macos_syslog' # Apple system log elif os.name == 'posix': # Linux and macOS also have posix _PLATFORM = 'unix' -elif _system == 'Windows': +elif _SYSTEM == 'Windows': _PLATFORM = 'windows' -elif _system.startswith('CYGWIN'): # e.g. 'CYGWIN_NT-6.1' +elif _SYSTEM.startswith('CYGWIN'): # e.g. 'CYGWIN_NT-6.1' _PLATFORM = 'cygwin' else: _PLATFORM = 'other' diff --git a/syslog2/_version.py b/syslog2/_version.py index 2eb0ffc..e739cce 100644 --- a/syslog2/_version.py +++ b/syslog2/_version.py @@ -23,4 +23,4 @@ #: #: * "M.N.P.dev1": Development level 1 of a not yet released version M.N.P #: * "M.N.P": A released version M.N.P -__version__ = '0.5.0.dev1' +__version__ = '0.5.0'