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

chore: remove Python 3.8, ensure Python 3.13 is included #3295

Merged
merged 4 commits into from
Nov 7, 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/packaging-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- uses: pypa/cibuildwheel@v2.21
env:
CIBW_ARCHS_MACOS: universal2
CIBW_BUILD: cp39-win_amd64 cp310-manylinux_x86_64 cp38-macosx_universal2
CIBW_BUILD: cp39-win_amd64 cp310-manylinux_x86_64 cp39-macosx_universal2
with:
config-file: cibuildwheel.toml
package-dir: awkward-cpp
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
- '3.11'
- '3.10'
- '3.9'
- '3.8'
python-architecture:
- x64
dependencies-kind:
Expand All @@ -58,7 +57,7 @@ jobs:
python-architecture: x86
runs-on: windows-latest
dependencies-kind: numpy1
- python-version: '3.8'
- python-version: '3.9'
python-architecture: x64
runs-on: ubuntu-latest
dependencies-kind: minimal
Expand Down Expand Up @@ -180,9 +179,9 @@ jobs:
# Cache invalidates daily by default
cache-environment: true
environment-name: awkward
# Need Python 3.8 for the cached wheels
# Need Python 3.9 for the cached wheels
create-args: >-
python=3.8
python=3.9
numpy
root

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[![PyPI version](https://badge.fury.io/py/awkward.svg)](https://pypi.org/project/awkward)
[![Conda-Forge](https://img.shields.io/conda/vn/conda-forge/awkward)](https://github.com/conda-forge/awkward-feedstock)
[![Python 3.8‒3.12](https://img.shields.io/badge/python-3.8%E2%80%923.12-blue)](https://www.python.org)
[![Python 3.9‒3.13](https://img.shields.io/badge/python-3.9%E2%80%923.13-blue)](https://www.python.org)
[![BSD-3 Clause License](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
[![Build Test](https://github.com/scikit-hep/awkward/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/scikit-hep/awkward/actions/workflows/test.yml)

Expand Down
7 changes: 1 addition & 6 deletions awkward-cpp/src/awkward_cpp/cpu_kernels.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,8 @@
from __future__ import annotations

import ctypes
import importlib.resources as importlib_resources
import platform
import sys

if sys.version_info < (3, 9):
import importlib_resources
else:
import importlib.resources as importlib_resources

import awkward_cpp._kernel_signatures

Expand Down
7 changes: 1 addition & 6 deletions awkward-cpp/src/awkward_cpp/libawkward.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,8 @@
from __future__ import annotations

import ctypes
import importlib.resources as importlib_resources
import platform
import sys

if sys.version_info < (3, 9):
import importlib_resources
else:
import importlib.resources as importlib_resources

if platform.system() == "Windows":
name = "awkward.dll"
Expand Down
3 changes: 2 additions & 1 deletion dev/flake8_awkward.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import ast
import sys
from typing import Iterator, NamedTuple
from collections.abc import Iterator
from typing import NamedTuple


class Flake8ASTErrorInfo(NamedTuple):
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import nox

ALL_PYTHONS = ["3.8", "3.9", "3.10", "3.11", "3.12"]
ALL_PYTHONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]

nox.needs_version = ">=2024.3.2"
nox.options.default_venv_backend = "uv|virtualenv"
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "awkward"
version = "2.6.10"
description = "Manipulate JSON-like data with NumPy-like idioms."
license = { text = "BSD-3-Clause" }
requires-python = ">=3.8"
requires-python = ">=3.9"
authors = [
{ name = "Jim Pivarski", email = "pivarski@princeton.edu" },
]
Expand All @@ -27,7 +27,6 @@ classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down Expand Up @@ -138,7 +137,7 @@ filterwarnings = [
log_cli_level = "info"

[tool.pylint]
py-version = "3.8"
py-version = "3.9"
jobs = "0"
ignore-paths = [
"src/awkward/_typeparser/generated_parser.py",
Expand Down
2 changes: 1 addition & 1 deletion requirements-test-minimal.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fsspec>=2022.11.0;sys_platform != "win32"
numpy==1.18.0
numpy==1.19.3
pyarrow==7.0.0
pytest>=6
pytest-cov
Expand Down
4 changes: 2 additions & 2 deletions src/awkward/_nplikes/typetracer.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from __future__ import annotations

from collections.abc import Collection, Sequence, Set
from collections.abc import Collection, Iterator, Sequence, Set
from numbers import Number
from typing import Callable, Iterator
from typing import Callable

import numpy

Expand Down
Loading