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

Add initial support for python 3.13 #6240

Merged
merged 10 commits into from
Sep 13, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13]
os: [MacOS, Ubuntu, Windows]

steps:
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repos:
args: [--fix, --exit-non-zero-on-fix]

- repo: https://github.com/psf/black
rev: 23.7.0
rev: 24.8.0
hooks:
- id: black

Expand Down Expand Up @@ -58,6 +58,6 @@ repos:
- id: pyproject-fmt

- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.14
rev: v0.19
hooks:
- id: validate-pyproject
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ sphinx = "*"
sphinx-click = "==4.*"
sphinxcontrib-spelling = "==7.*"
click = "==8.0.3"
pypiserver = "==1.*"
stdeb = {version="*", sys_platform = "== 'linux'"}
zipp = {version = "==3.6.0", markers = "python_version < '3.10'"}
pre-commit = "==2.*"
Expand All @@ -29,6 +28,7 @@ pyyaml = "==6.0.1"
build = "*"
twine = "*"
semver = "*"
pypiserver = {ref = "pipenv-313", git = "https://github.com/matteius/pypiserver.git"}
oz123 marked this conversation as resolved.
Show resolved Hide resolved

[packages]
pytz = "*"
Expand Down
820 changes: 492 additions & 328 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions news/6240.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix for Windows on ARM missing distlib binaries in pyproject.toml
1 change: 1 addition & 0 deletions news/6240.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Initial support for python3.13
1 change: 1 addition & 0 deletions pipenv/utils/fileutils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""A collection for utilities for working with files and paths."""

import atexit
import io
import os
Expand Down
1 change: 1 addition & 0 deletions pipenv/utils/funktools.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
A small collection of useful functional tools for working with iterables.
"""

import errno
import locale
import os
Expand Down
8 changes: 5 additions & 3 deletions pipenv/utils/indexes.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,11 @@ def get_source_list(

if pypi_mirror:
sources = [
create_mirror_source(pypi_mirror, source["name"])
if is_pypi_url(source["url"])
else source
(
create_mirror_source(pypi_mirror, source["name"])
if is_pypi_url(source["url"])
else source
)
oz123 marked this conversation as resolved.
Show resolved Hide resolved
for source in sources
]
return sources
Expand Down
1 change: 0 additions & 1 deletion pipenv/utils/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ def get_package_finder(


class HashCacheMixin:

"""Caches hashes of PyPI artifacts so we do not need to re-download them.

Hashes are only cached when the URL appears to contain a hash in it and the
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ exclude = ["tests*", "tests.*", "tasks*", "tasks.*"]
"pipenv.patched.pip._vendor.distlib" = [
"t32.exe",
"t64.exe",
"t64-arm.exe",
"w32.exe",
"w64.exe",
"w64-arm.exe",
]
"pipenv.vendor.ruamel" = ["yaml"]

Expand Down
6 changes: 1 addition & 5 deletions tests/integration/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,7 @@ def test_pipenv_graph_reverse(pipenv_instance_private_pypi):
output,
flags=re.MULTILINE | re.IGNORECASE)
assert openpyxl_dep is None, f'openpyxl should not appear at beginning of lines in {output}'

if sys.version_info[:2] == (3, 12):
assert 'openpyxl==2.5.4 [requires: et_xmlfile]' in output
else:
assert 'openpyxl==2.5.4 [requires: et-xmlfile]' in output
assert 'openpyxl==2.5.4 [requires: et_xmlfile]' in output
oz123 marked this conversation as resolved.
Show resolved Hide resolved
else:
dep_match = re.search(fr'^[ -]*{dep_name}==[\d.]+$',
output,
Expand Down
Loading