Skip to content

Commit

Permalink
Merge pull request #988 from scikit-hep/main-v510
Browse files Browse the repository at this point in the history
chore: merge `main-v510` into `main`, ending the two-main branch era
  • Loading branch information
jpivarski authored Oct 13, 2023
2 parents f24c00e + 644ba58 commit e649af2
Show file tree
Hide file tree
Showing 22 changed files with 670 additions and 363 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ jobs:
fail-fast: false
matrix:
platform: ["windows-latest", "macos-latest", "ubuntu-latest"]
python-version: ["3.7", "3.8", "3.9", "3.10"]
exclude:
- platform: "windows-latest"
python-version: "3.7"
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

runs-on: "${{ matrix.platform }}"
timeout-minutes: 30
Expand Down Expand Up @@ -73,7 +70,6 @@ jobs:
runs-on: "${{ matrix.platform }}"
timeout-minutes: 30


steps:
- uses: "actions/checkout@v4"

Expand Down
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,10 @@ repos:
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]


- repo: https://github.com/asottile/pyupgrade
rev: v3.13.0
hooks:
- id: pyupgrade
args: ["--py38-plus"]
15 changes: 8 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "uproot"
description = "ROOT I/O in pure Python and NumPy."
readme = "README.md"
license = "BSD-3-Clause"
requires-python = ">=3.7"
requires-python = ">=3.8"
authors = [
{ name = "Jim Pivarski", email = "[email protected]" },
]
Expand All @@ -25,11 +25,11 @@ classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Information Analysis",
"Topic :: Scientific/Engineering :: Mathematics",
Expand All @@ -38,10 +38,11 @@ classifiers = [
"Topic :: Utilities",
]
dependencies = [
"awkward>=2.0.0",
"awkward>=2.4.6",
"importlib-metadata;python_version<\"3.8\"",
"numpy",
"packaging",
"typing_extensions>=4.1.0; python_version < \"3.11\""
]
dynamic = [
"version",
Expand All @@ -50,16 +51,16 @@ dynamic = [
[project.optional-dependencies]
dev = [
"boost_histogram>=0.13",
"dask-awkward>=2023.9.0;python_version >= \"3.8\"",
"dask[array];python_version >= \"3.8\"",
"dask-awkward>=2023.10.0",
"dask[array]",
"hist>=1.2",
"pandas",
"awkward-pandas;python_version >= \"3.8\"",
"awkward-pandas",
]
test = [
"lz4",
"minio",
"aiohttp",
"aiohttp; python_version<\"3.12\"",
"fsspec",
"fsspec-xrootd",
"pytest>=6",
Expand Down
2 changes: 1 addition & 1 deletion src/uproot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
from uproot.behavior import behavior_of

from uproot._util import no_filter
from uproot._dask import dask
from uproot._dask import dask, ImplementsFormMapping, ImplementsFormMappingInfo

from uproot.pyroot import from_pyroot
from uproot.pyroot import to_pyroot
Loading

0 comments on commit e649af2

Please sign in to comment.