From 263fe4839e35ca6da96b7a268d0899995a69f27e Mon Sep 17 00:00:00 2001 From: Greg Lindahl Date: Mon, 30 Dec 2024 02:02:52 +0000 Subject: [PATCH 1/4] support pandas2 --- .github/workflows/test-all.yml | 47 +++++++++++++++++++++++++++++----- setup.py | 2 -- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index e624e20..4bbceb8 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -8,17 +8,21 @@ on: jobs: linux-macos: - name: test-all ${{ matrix.os }} ${{ matrix.python-version }} ${{ matrix.VERBOSE }} + name: test-all ${{ matrix.os }} ${{ matrix.python-version }} ${{ matrix.VERBOSE }} ${{ matrix.ONE }} ${{ matrix.ONLY_BUILTINS }} runs-on: ${{ matrix.os }} timeout-minutes: 10 strategy: fail-fast: false matrix: os: [ubuntu-latest] - python-version: [3.7, 3.8, 3.9, '3.10', '3.11'] - # 3.12 has no pandas wheel, takes a long time to build + python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13'] EXTRA: [false] # used to force includes to get included + ONLY_BUILTINS: [false] # used to turn off ray + ONE: [false] # used to force pandas<2 include: + - python-version: 3.7 + os: ubuntu-20.04 # oldest LTS in github actions + EXTRA: true - python-version: 3.7 os: ubuntu-latest # make sure that the most verbose level is not crashy @@ -26,6 +30,36 @@ jobs: PARAMSURVEY_VERBOSE: 3 PYTEST_STDERR_VISIBLE: -s EXTRA: true + - python-version: 3.7 + os: ubuntu-latest + EXTRA: true + ONE: true + - python-version: '3.11' + os: macos-latest + EXTRA: true + ONLY_BUILTINS: true + - python-version: '3.11' + os: macos-latest + EXTRA: true + ONE: true # this wheel exists, does not in 3.13 + ONLY_BUILTINS: true + - python-version: '3.13' + os: macos-latest + EXTRA: true + ONLY_BUILTINS: true + - python-version: '3.7' + os: windows-latest + EXTRA: true + ONLY_BUILTINS: true + - python-version: '3.7' + os: windows-latest + EXTRA: true + ONE: true # this wheel exists, does not in 3.13 + ONLY_BUILTINS: true + - python-version: '3.13' + os: windows-latest + EXTRA: true + ONLY_BUILTINS: true steps: @@ -37,10 +71,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install setuptools on python 3.12+ - if: ${{ matrix.python-version >= '3.12' }} + - name: Install pandas<2 if needed + if: ${{ matrix.ONE }} run: | - pip install setuptools + pip install 'numpy<2' # or macos screws up + pip install 'pandas<2' - name: 'Install dependencies' run: | diff --git a/setup.py b/setup.py index a33a76f..1f41e93 100755 --- a/setup.py +++ b/setup.py @@ -12,8 +12,6 @@ requires = [ 'hdrhistogram', - 'pandas<2', # temporary until pandas-appender is fixed - 'numpy<2', # temporary until pandas-appender is fixed 'pandas-appender>=0.9.1', 'psutil', ] From 455d3c3b3f960c172a080cf12dcbd0709bf2b84f Mon Sep 17 00:00:00 2001 From: Greg Lindahl Date: Mon, 30 Dec 2024 02:12:07 +0000 Subject: [PATCH 2/4] support pandas2 --- .github/workflows/test-all.yml | 14 +++++++------- CHANGELOG.md | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index 4bbceb8..e842b7e 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -17,7 +17,7 @@ jobs: os: [ubuntu-latest] python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13'] EXTRA: [false] # used to force includes to get included - ONLY_BUILTINS: [false] # used to turn off ray + ONLY_BUILTINS: [''] # used to turn off ray ONE: [false] # used to force pandas<2 include: - python-version: 3.7 @@ -37,29 +37,29 @@ jobs: - python-version: '3.11' os: macos-latest EXTRA: true - ONLY_BUILTINS: true + ONLY_BUILTINS: 1 - python-version: '3.11' os: macos-latest EXTRA: true ONE: true # this wheel exists, does not in 3.13 - ONLY_BUILTINS: true + ONLY_BUILTINS: 1 - python-version: '3.13' os: macos-latest EXTRA: true - ONLY_BUILTINS: true + ONLY_BUILTINS: 1 - python-version: '3.7' os: windows-latest EXTRA: true - ONLY_BUILTINS: true + ONLY_BUILTINS: 1 - python-version: '3.7' os: windows-latest EXTRA: true ONE: true # this wheel exists, does not in 3.13 - ONLY_BUILTINS: true + ONLY_BUILTINS: 1 - python-version: '3.13' os: windows-latest EXTRA: true - ONLY_BUILTINS: true + ONLY_BUILTINS: 1 steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b50bd7..0c1506c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +- 0.4.21 + + removed numpy<2 pandas<2 now that pandas-appender is updated + + test on macos and windows + + test pandas<2 just to be sure + - 0.4.20 + moved CI to Github Actions, dropped py3.7 + moved coverage to CodeCov From b515403492c32b42555121000cb616bdec26d9e7 Mon Sep 17 00:00:00 2001 From: Greg Lindahl Date: Mon, 30 Dec 2024 02:24:01 +0000 Subject: [PATCH 3/4] support pandas2 --- .github/workflows/test-all.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index e842b7e..6175a0c 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13'] + python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12'] EXTRA: [false] # used to force includes to get included ONLY_BUILTINS: [''] # used to turn off ray ONE: [false] # used to force pandas<2 @@ -34,6 +34,10 @@ jobs: os: ubuntu-latest EXTRA: true ONE: true + - python-version: '3.13' + os: ubuntu-latest + EXTRA: true + ONLY_BUILTINS: 1 # no ray wheel for 3.13 - python-version: '3.11' os: macos-latest EXTRA: true @@ -47,19 +51,19 @@ jobs: os: macos-latest EXTRA: true ONLY_BUILTINS: 1 - - python-version: '3.7' - os: windows-latest - EXTRA: true - ONLY_BUILTINS: 1 - - python-version: '3.7' - os: windows-latest - EXTRA: true - ONE: true # this wheel exists, does not in 3.13 - ONLY_BUILTINS: 1 - - python-version: '3.13' - os: windows-latest - EXTRA: true - ONLY_BUILTINS: 1 + #- python-version: '3.7' + # os: windows-latest + # EXTRA: true + # ONLY_BUILTINS: 1 + #- python-version: '3.7' + # os: windows-latest + # EXTRA: true + # ONE: true # this wheel exists, does not in 3.13 + # ONLY_BUILTINS: 1 + #- python-version: '3.13' + # os: windows-latest + # EXTRA: true + # ONLY_BUILTINS: 1 steps: From f5dcf7b18c0234de18449d89c5b7d54097bf34f7 Mon Sep 17 00:00:00 2001 From: Greg Lindahl Date: Mon, 30 Dec 2024 02:26:59 +0000 Subject: [PATCH 4/4] indicate 3.12 and 3.13 support --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 1f41e93..cf0591b 100755 --- a/setup.py +++ b/setup.py @@ -72,6 +72,8 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Programming Language :: Python :: 3 :: Only', ], )