diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index cbe187a3..166672b7 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -28,7 +28,7 @@ jobs: # based on. - name: Checkout head commits # https://github.com/actions/checkout - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v3 #with: #ref: ${{github.head.sha}} #repository: ${{github.event.pull_request.head.repo.full_name}} @@ -53,7 +53,7 @@ jobs: # Get Python set up #################################################################### - name: Set up Python 3.10 - uses: actions/setup-python@v2.3.2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/push-checks.yml b/.github/workflows/push-checks.yml index 100e2363..be4fc9da 100644 --- a/.github/workflows/push-checks.yml +++ b/.github/workflows/push-checks.yml @@ -17,11 +17,11 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python 3.10 - uses: actions/setup-python@v2.3.2 + uses: actions/setup-python@v3 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 09562e1f..8ed83d31 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -17,7 +17,7 @@ jobs: OWNER: 'EDCD' steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: submodules: true diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 9aaea7e6..6f8aa2a4 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -16,11 +16,11 @@ jobs: shell: powershell steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v3 with: submodules: true - - uses: actions/setup-python@v2.3.2 + - uses: actions/setup-python@v3 with: python-version: "3.10.2" architecture: "x86" diff --git a/ChangeLog.md b/ChangeLog.md index d8f721e3..572acd67 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,12 @@ produce the Windows executables and installer. --- +Release 5.3.2 +=== + +This release contains one change to cope with how Frontier decided to name +the Journal files differently in the Update 11 Odyssey client. + Release 5.3.1 === diff --git a/config/__init__.py b/config/__init__.py index 0307386e..2e8b044d 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.3.1' +_static_appversion = '5.3.2' _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2022 EDCD' diff --git a/monitor.py b/monitor.py index b271b0c3..dc3a12e5 100644 --- a/monitor.py +++ b/monitor.py @@ -80,7 +80,8 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below _POLL = 1 # Polling is cheap, so do it often _RE_CANONICALISE = re.compile(r'\$(.+)_name;') _RE_CATEGORY = re.compile(r'\$MICRORESOURCE_CATEGORY_(.+);') - _RE_LOGFILE = re.compile(r'^Journal(Alpha|Beta)?\.[0-9]{12}\.[0-9]{2}\.log$') + _RE_LOGFILE = re.compile(r'^Journal(Alpha|Beta)?\.[0-9]{2,4}(-)?[0-9]{2}(-)?[0-9]{2}(T)?[0-9]{2}[0-9]{2}[0-9]{2}' + r'\.[0-9]{2}\.log$') _RE_SHIP_ONFOOT = re.compile(r'^(FlightSuit|UtilitySuit_Class.|TacticalSuit_Class.|ExplorationSuit_Class.)$') def __init__(self) -> None: diff --git a/requirements-dev.txt b/requirements-dev.txt index abeab851..154c5e0f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,7 +9,7 @@ setuptools==60.9.3 # Static analysis tools flake8==4.0.1 -flake8-annotations-coverage==0.0.5 +flake8-annotations-coverage==0.0.6 flake8-cognitive-complexity==0.1.0 flake8-comprehensions==3.8.0 flake8-docstrings==1.6.0 @@ -23,7 +23,7 @@ flake8-use-fstring==1.3 mypy==0.931 pep8-naming==0.12.1 safety==1.10.3 -types-requests==2.27.10 +types-requests==2.27.11 # Code formatting tools autopep8==1.6.0 @@ -42,7 +42,7 @@ py2exe==0.11.1.0; sys_platform == 'win32' # Testing pytest==7.0.1 pytest-cov==3.0.0 # Pytest code coverage support -coverage[toml]==6.3.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs +coverage[toml]==6.3.2 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs # For manipulating folder permissions and the like. pywin32==303; sys_platform == 'win32'