Skip to content

Commit

Permalink
Release 0.5.0; fixed pywin32 versions; module level names
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Maier <[email protected]>
  • Loading branch information
andy-maier committed Sep 5, 2022
1 parent 9ebd65f commit 3d0aab0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
6 changes: 3 additions & 3 deletions docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 4 additions & 5 deletions minimum-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)
Expand Down
16 changes: 3 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
10 changes: 5 additions & 5 deletions syslog2/_syslog2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion syslog2/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit 3d0aab0

Please sign in to comment.