Skip to content

Commit

Permalink
Merge branch 'master' into array_ufunc_multiplication
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewgsavage authored Aug 16, 2023
2 parents 800219e + 6c2dda9 commit aeae5e5
Show file tree
Hide file tree
Showing 26 changed files with 527 additions and 582 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: codspeed-benchmarks

on:
push:
branches:
- "master"
- "develop"
pull_request:
# `workflow_dispatch` allows CodSpeed to trigger backtest
# performance analysis in order to generate initial data.
workflow_dispatch:

jobs:
benchmarks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: "3.11"

- name: Install dependencies
run: pip install "numpy>=1.21,<2.0.0"

- name: Install bench dependencies
run: pip install .[bench]

- name: Run benchmarks
uses: CodSpeedHQ/action@v1
with:
token: ${{ secrets.CODSPEED_TOKEN }}
run: pytest . --codspeed
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest

env:
TEST_OPTS: "-rfsxEX -s --cov=pint --cov-config=.coveragerc"
TEST_OPTS: "-rfsxEX -s --cov=pint --cov-config=.coveragerc --benchmark-skip"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -64,8 +64,8 @@ jobs:
- name: Install dependencies
run: |
sudo apt install -y graphviz
pip install pytest pytest-cov pytest-subtests packaging
pip install .
pip install packaging
pip install .[testbase]
- name: Install pytest-mpl
if: contains(matrix.extras, 'matplotlib')
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
runs-on: windows-latest

env:
TEST_OPTS: "-rfsxEX -s -k issue1498b"
TEST_OPTS: "-rfsxEX -s -k issue1498b --benchmark-skip"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -139,15 +139,15 @@ jobs:
- name: Install dependencies
run: |
# sudo apt install -y graphviz
pip install pytest pytest-cov pytest-subtests packaging
pip install .
pip install packaging
pip install .[testbase]
# - name: Install pytest-mpl
# if: contains(matrix.extras, 'matplotlib')
# run: pip install pytest-mpl

- name: Run tests
run: pytest ${env:TEST_OPTS}
run: pytest -rfsxEX -s -k issue1498b --benchmark-skip

test-macos:
strategy:
Expand All @@ -158,7 +158,7 @@ jobs:
runs-on: macos-latest

env:
TEST_OPTS: "-rfsxEX -s --cov=pint --cov-config=.coveragerc"
TEST_OPTS: "-rfsxEX -s --cov=pint --cov-config=.coveragerc --benchmark-skip"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -191,8 +191,8 @@ jobs:

- name: Install dependencies
run: |
pip install pytest pytest-cov pytest-subtests packaging
pip install .
pip install packaging
pip install .[testbase]
- name: Run Tests
run: |
Expand Down
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ Pint Changelog
0.23 (unreleased)
-----------------

- Fixed Transformation type protocol.
(PR #1805)
- Documented to_preferred and created added an autoautoconvert_to_preferred registry option.
(PR #1803)
- Fixed bug causing operations between arrays of quantity scalars and quantity holding
array resulting in incorrect units.
(PR #1677)
- Optimize matplotlib unit conversion for Quantity arrays
(PR #1819)


0.22 (2023-05-25)
Expand Down
160 changes: 0 additions & 160 deletions benchmarks/asv.conf.json

This file was deleted.

16 changes: 0 additions & 16 deletions benchmarks/benchmarks/00_common.py

This file was deleted.

13 changes: 0 additions & 13 deletions benchmarks/benchmarks/01_registry_creation.py

This file was deleted.

Loading

0 comments on commit aeae5e5

Please sign in to comment.