From b1428afad730dda9393702e0af8e7f6a0eba4e57 Mon Sep 17 00:00:00 2001 From: Tianlu Yuan <5412915+tianluyuan@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:44:20 -0500 Subject: [PATCH 1/4] unpin scipy. bump patch ver --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 166e0fd..4bf7223 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name='nuVeto', - version='2.2.3', + version='2.2.4', maintainer='Tianlu Yuan', maintainer_email='tyuan@icecube.wisc.edu', description='Package implements the formalism for calculating passing fraction as discussed in JCAP07(2018)047.', @@ -14,7 +14,7 @@ 'nuVeto':['data/decay_distributions/*.npz','data/prpl/*.pkl','data/corsika/*.pkl'], 'nuVeto.resources.mu':['mmc/ice*.pklz'] }, - install_requires=['numpy<2.0.0', 'scipy<1.14.0', 'MCEq'], + install_requires=['numpy<2.0.0', 'scipy', 'MCEq'], extras_require={ 'plotting': ['matplotlib'], 'resources': ['pythia8', 'matplotlib', 'argparse', 'pandas'], From 4c6d40915241f681fc62a4589616cc644761b2da Mon Sep 17 00:00:00 2001 From: Tianlu Yuan <5412915+tianluyuan@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:55:23 -0500 Subject: [PATCH 2/4] test python3.x and increment other versions --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 8454e6e..9f55bce 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12", "3.x"] os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: From 974ef658a518f7715e5c6c5d8feba30d6e524468 Mon Sep 17 00:00:00 2001 From: Tianlu Yuan <5412915+tianluyuan@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:22:21 -0500 Subject: [PATCH 3/4] use rstring --- nuVeto/external/selfveto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuVeto/external/selfveto.py b/nuVeto/external/selfveto.py index 5225641..a9af009 100755 --- a/nuVeto/external/selfveto.py +++ b/nuVeto/external/selfveto.py @@ -398,7 +398,7 @@ def plot_response_function(enu, depth, cos_theta, kind): ax.plot(energy_per_nucleon, (numpy.exp(-muyield)*response).sum(axis=-2), color='k', ls='--', lw=1, label='(no muons)') pylab.loglog() - ax.set_ylabel('Partial flux $[GeV^{-1}\, m^{-2}\, sr^{-1}\, s^{-1}]$') + ax.set_ylabel(r'Partial flux $[GeV^{-1}\, m^{-2}\, sr^{-1}\, s^{-1}]$') ax.legend(loc='best', prop=dict(size='small'), title='Flux contributions') passrate = (numpy.exp(-muyield)*response).sum(axis=(-2, -1))/response.sum(axis=(-2, -1)) ax.set_title('%s %s from %d deg at %d m depth: %d%% passing rate' % From 06724e6ceadb78cafc3dc9eebfdb48ccf1c69e40 Mon Sep 17 00:00:00 2001 From: Tianlu Yuan <5412915+tianluyuan@users.noreply.github.com> Date: Tue, 4 Feb 2025 14:13:47 -0600 Subject: [PATCH 4/4] relax scipy / numpy pin --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6657b4d..9eb5f73 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,8 +14,8 @@ license = {file = "LICENSE"} requires-python = ">= 3.7" dependencies = [ - "numpy<2.0.0", - "scipy", + "numpy<3", + "scipy<2", "MCEq", "pandas" ]