Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove distutils #166

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,22 @@ classifiers = [
]

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.8"
attrs = ">=17.4.0"
structlog = "^20.1.0"
structlog = "^24"
aiohttp = ">=3"
packaging = ">=23"

[tool.poetry.dev-dependencies]
jinja2 = "^3.1.2"
pytest = "^6.0.1"
pytest = "^8"
pytest-asyncio = "^0.14.0"
sphinx = "^5.2.3"
pytest-cov = "^2.10.1"
asyncio-extras = "^1.3.2"
pre-commit = "^2.7.1"
black = "^22.10.0"
Pillow = "^8.1.0"
Pillow = "^9"

[tool.poetry.scripts]
arsenic-check-ie11 = "arsenic.helpers:check_ie11_environment_cli"
Expand Down
10 changes: 5 additions & 5 deletions src/arsenic/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import asyncio
import re
import sys
from distutils.version import StrictVersion
from packaging import version
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: arguably version safety check could be done without the extra dep

from functools import partial
from typing import List, TextIO, Optional

Expand Down Expand Up @@ -91,11 +91,11 @@ async def _check_version(self):
"disable version checking, set `version_check` to "
"`False`."
)
version_str = match.group(1)
version = StrictVersion(version_str)
if version < StrictVersion("0.16.1"):
binary_version_str = match.group(1)
binary_version = version.parse(binary_version_str)
if binary_version < version.parse("0.16.1"):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That version was release on Apr 26, 2017.

Perhaps this check can be removed entirely?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh i'm fine with just removing the version check completely

raise ValueError(
f"Geckodriver version {version_str} is too old. 0.16.1 or "
f"Geckodriver version {binary_version_str} is too old. 0.16.1 or "
f"higher is required. To disable version checking, set "
f"`version_check` to `False`."
)
Expand Down