Skip to content

Commit

Permalink
Upgrade pip dependencies and simplify their version constraints (#1742)
Browse files Browse the repository at this point in the history
  • Loading branch information
bartfeenstra authored Jul 23, 2024
1 parent 93b4075 commit 757ec10
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 44 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ __pycache__
*.pyc
*.pyc.*

# PyInstaller build artifacts.

# Test artifacts.
/.coverage
/.coverage.*
Expand Down
2 changes: 0 additions & 2 deletions betty/tests/_package/test_license_compatibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ class TestPackageLicenses:
_GPL_V3_COMPATIBLE_DISTRIBUTIONS = (
# We do not include basedtyping in any Betty distribution.
"basedtyping",
# We do not include PyInstaller in any Betty distributions.
"pyinstaller",
)

_GPL_V3_COMPATIBLE_LICENSES = (
Expand Down
79 changes: 39 additions & 40 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
'setuptools ~= 70.0',
'setuptools ~= 71.0',
]
build-backend = 'setuptools.build_meta'

Expand All @@ -19,26 +19,26 @@ requires-python = '~= 3.11'
dependencies = [
'aiofiles ~= 24.1',
'aiohttp ~= 3.9',
'babel ~= 2.12, >= 2.12.0',
'click ~= 8.1, >= 8.1.2',
'docker ~= 7.0, >= 7.0.0',
'babel ~= 2.15',
'click ~= 8.1',
'docker ~= 7.1',
'furo == 2024.7.18',
'geopy ~= 2.3, >= 2.3.0',
'geopy ~= 2.4',
'html5lib ~= 1.1',
'jinja2 ~= 3.1, >= 3.1.1',
'jsonschema ~= 4.17, >= 4.17.0',
'langcodes ~= 3.3, >= 3.3.0',
'markupsafe ~= 2.1, >= 2.1.1',
'multidict ~= 6.0, >= 6.0.5',
'pdf2image ~= 1.16, >= 1.16.0',
'polib ~= 1.2, >= 1.2.0',
'Pillow ~= 10.1, >= 10.1.0',
'pyyaml ~= 6.0, >= 6.0.0',
'jinja2 ~= 3.1',
'jsonschema ~= 4.23',
'langcodes ~= 3.4',
'markupsafe ~= 2.1',
'multidict ~= 6.0',
'pdf2image ~= 1.17',
'polib ~= 1.2',
'Pillow ~= 10.4',
'pyyaml ~= 6.0',
'referencing ~= 0.35',
'sphinx ~= 7.2, >= 7.2.6',
'sphinx ~= 7.4',
'sphinx-design ~= 0.6',
'sphinx-autodoc-typehints ~= 2.2',
'typing_extensions ~= 4.10, >= 4.10.0',
'typing_extensions ~= 4.12',
]
classifiers = [
'Environment :: Console',
Expand Down Expand Up @@ -151,42 +151,41 @@ betty = 'betty.cli:main'

[project.optional-dependencies]
setuptools = [
'setuptools ~= 70.0',
'twine ~= 5.0',
'setuptools ~= 71.0',
'twine ~= 5.1',
'wheel ~= 0.43',
]
test = [
'aioresponses ~= 0.7, >= 0.7.6',
'basedmypy ~= 2.0, >= 2.2.1',
'coverage ~= 7.2, >= 7.2.4',
'lxml ~= 5.0; sys.platform != "win32"',
'packaging ~= 24.0',
'pip-licenses ~= 4.3, >= 4.3.0',
'pytest ~= 8.2',
'pytest-aioresponses ~= 0.2, >= 0.2.0 ',
'pytest-asyncio ~= 0.23, >= 0.23.4 ',
'pytest-mock ~= 3.10, >= 3.10.0',
'aioresponses ~= 0.7',
'basedmypy ~= 2.5',
'coverage ~= 7.6',
'lxml ~= 5.2; sys.platform != "win32"',
'packaging ~= 24.1',
'pip-licenses ~= 5.0',
'pytest ~= 8.3',
'pytest-aioresponses ~= 0.2',
'pytest-asyncio ~= 0.23',
'pytest-mock ~= 3.14',
'ruff ~= 0.5',
'types-aiofiles ~= 24.1',
'types-babel ~= 2.11, >= 2.11.0.15',
'types-click ~= 7.1, >= 7.1.8',
'types-html5lib ~= 1.1, >= 1.1.11.20240228',
'types-jsonschema ~= 4.21, >= 4.21.0.20240331',
'types-lxml >= 2024.3.27 ',
'types-polib ~= 1.2, >= 1.2.0.0',
'types-pyinstaller ~= 6.5, >= 6.5.0.20240311',
'types-pyyaml ~= 6.0, >= 6.0.6',
'types-requests ~= 2.29, >= 2.29.0.0',
'types-setuptools ~= 70.0',
'types-babel ~= 2.11',
'types-click ~= 7.1',
'types-html5lib ~= 1.1',
'types-jsonschema ~= 4.23',
'types-lxml >= 2024.4.14',
'types-polib ~= 1.2',
'types-pyyaml ~= 6.0',
'types-requests ~= 2.32',
'types-setuptools ~= 71.0',
'virtualenv ~= 20.26',
'betty[setuptools]',
]
development = [
'pytest-repeat ~= 0.9, >= 0.9.1',
'pytest-repeat ~= 0.9',
'betty[test]',
]
ci = [
'codecov ~= 2.1, >= 2.1.12',
'codecov ~= 2.1',
'betty[test]',
]

Expand Down

0 comments on commit 757ec10

Please sign in to comment.