Skip to content

Commit 6547759

Browse files
fabiolsilvafabiolsilva
committed
Fixed Python 3.12 and 3.13 compatibility issues.
1 parent f172d3c commit 6547759

File tree

3 files changed

+32
-33
lines changed

3 files changed

+32
-33
lines changed

‎bbp/comps/PySeismoSoil/PySeismoSoil/class_site_factors.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import os
44
import itertools
55
import numpy as np
6-
import pkg_resources
6+
import importlib.resources
77
from scipy.interpolate import griddata
88

99
from .class_frequency_spectrum import Frequency_Spectrum
@@ -41,10 +41,9 @@ class Site_Factors():
4141
#%%------------------------------------------------------------------------
4242
def __init__(self, Vs30_in_meter_per_sec, z1_in_m, PGA_in_g,
4343
lenient=False):
44-
self.dir_amplif = pkg_resources.resource_filename('PySeismoSoil',
45-
'data/amplification/')
46-
self.dir_phase = pkg_resources.resource_filename('PySeismoSoil',
47-
'data/phase/')
44+
base_pkg_dir = importlib.resources.files("PySeismoSoil")
45+
self.dir_amplif = os.path.join(base_pkg_dir, 'data', 'amplification')
46+
self.dir_phase = os.path.join(base_pkg_dir, 'data', 'phase')
4847

4948
status = Site_Factors._range_check(Vs30_in_meter_per_sec, z1_in_m,
5049
PGA_in_g)

‎bbp/comps/PySeismoSoil/PySeismoSoil/helper_site_response.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,9 +1107,9 @@ def linear_tf(vs_profile, show_fig=True, freq_resolution=.05, fmax=30.):
11071107

11081108
x_limits = [0,fmax]
11091109
x_limits_log = [1e-1,fmax]
1110-
ax = fig.add_subplot(3,4,1); plt.plot(freq_array,AF_ro,'k'); plt.ylabel('S to R.O.'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.title('Amplitude'); plt.text(0.55,0.85,'$\mathregular{f_0}$ = %.2f Hz'%f0_ro,transform=ax.transAxes,fontweight='bold'); ax.set_axisbelow(True)
1111-
ax = fig.add_subplot(3,4,5); plt.plot(freq_array,AF_in,'k'); plt.ylabel('S to Inci.'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.text(0.55,0.85,'$\mathregular{f_0}$ = %.2f Hz'%f0_in,transform=ax.transAxes,fontweight='bold'); ax.set_axisbelow(True)
1112-
ax = fig.add_subplot(3,4,9); plt.plot(freq_array,AF_bh,'k'); plt.ylabel('S to B.H.'); plt.xlabel('Frequency [Hz]'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.text(0.55,0.85,'$\mathregular{f_0}$= %.2f Hz'%f0_bh,transform=ax.transAxes,fontweight='bold'); ax.set_axisbelow(True)
1110+
ax = fig.add_subplot(3,4,1); plt.plot(freq_array,AF_ro,'k'); plt.ylabel('S to R.O.'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.title('Amplitude'); plt.text(0.55,0.85,r'$\mathregular{f_0}$ = %.2f Hz'%f0_ro,transform=ax.transAxes,fontweight='bold'); ax.set_axisbelow(True)
1111+
ax = fig.add_subplot(3,4,5); plt.plot(freq_array,AF_in,'k'); plt.ylabel('S to Inci.'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.text(0.55,0.85,r'$\mathregular{f_0}$ = %.2f Hz'%f0_in,transform=ax.transAxes,fontweight='bold'); ax.set_axisbelow(True)
1112+
ax = fig.add_subplot(3,4,9); plt.plot(freq_array,AF_bh,'k'); plt.ylabel('S to B.H.'); plt.xlabel('Frequency [Hz]'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.text(0.55,0.85,r'$\mathregular{f_0}$= %.2f Hz'%f0_bh,transform=ax.transAxes,fontweight='bold'); ax.set_axisbelow(True)
11131113
ax = fig.add_subplot(3,4,2); plt.plot(freq_array,np.unwrap(np.angle(TF_ro)),'k'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.title('Phase angle (rad)'); ax.set_axisbelow(True)
11141114
ax = fig.add_subplot(3,4,6); plt.plot(freq_array,np.unwrap(np.angle(TF_in)),'k'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); ax.set_axisbelow(True)
11151115
ax = fig.add_subplot(3,4,10); plt.plot(freq_array,np.unwrap(np.angle(TF_bh)),'k'); plt.xlim(x_limits); plt.grid(color=[0.5]*3,ls=':'); plt.xlabel('Frequency [Hz]'); ax.set_axisbelow(True)

‎bbp/tests/UnitTestsCI.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33
BSD 3-Clause License
44
5-
Copyright (c) 2021, University of Southern California
5+
Copyright (c) 2025, University of Southern California
66
All rights reserved.
77
88
Redistribution and use in source and binary forms, with or without
@@ -90,25 +90,25 @@ def close(self):
9090

9191
# Add broadband platform generic tests
9292
TS.addTests(CoreTestSuite())
93-
TS.addTest(unittest.makeSuite(TestPyNGA))
94-
TS.addTest(unittest.makeSuite(TestVm2vm))
95-
TS.addTest(unittest.makeSuite(TestCC))
93+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestPyNGA))
94+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestVm2vm))
95+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestCC))
9696

9797
# Add Graves & Pitarka tests
98-
TS.addTest(unittest.makeSuite(TestGenslip))
99-
TS.addTest(unittest.makeSuite(TestJbsim))
100-
TS.addTest(unittest.makeSuite(TestHfsims))
101-
TS.addTest(unittest.makeSuite(TestWccSiteamp))
102-
TS.addTest(unittest.makeSuite(TestMatch))
98+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestGenslip))
99+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestJbsim))
100+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestHfsims))
101+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestWccSiteamp))
102+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestMatch))
103103

104104
# Add Irikura tests
105-
TS.addTest(unittest.makeSuite(TestGenSRF))
106-
TS.addTest(unittest.makeSuite(TestIrikuraHF))
105+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestGenSRF))
106+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestIrikuraHF))
107107

108108
# Add UCSB tests
109-
TS.addTest(unittest.makeSuite(TestUCFaultUtils))
110-
TS.addTest(unittest.makeSuite(TestUCrmg))
111-
TS.addTest(unittest.makeSuite(TestUCSite))
109+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestUCFaultUtils))
110+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestUCrmg))
111+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestUCSite))
112112

113113
# Add SDSU tests
114114
if sys.platform == 'darwin':
@@ -119,21 +119,21 @@ def close(self):
119119
pass
120120

121121
# Add ExSIM tests
122-
TS.addTest(unittest.makeSuite(TestExsim))
122+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestExsim))
123123

124124
# Add Song tests
125-
TS.addTest(unittest.makeSuite(TestRMG))
125+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestRMG))
126126

127127
# Add Post-Processing tests
128-
TS.addTest(unittest.makeSuite(TestRotD50))
129-
TS.addTest(unittest.makeSuite(TestRotD100))
130-
TS.addTest(unittest.makeSuite(TestGPGof))
131-
TS.addTest(unittest.makeSuite(TestFAS))
132-
TS.addTest(unittest.makeSuite(TestFASGof))
133-
TS.addTest(unittest.makeSuite(TestSDSUMOGof))
134-
TS.addTest(unittest.makeSuite(TestAndersonGof))
135-
TS.addTest(unittest.makeSuite(TestRZZ2015))
136-
TS.addTest(unittest.makeSuite(TestAS16))
128+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestRotD50))
129+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestRotD100))
130+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestGPGof))
131+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestFAS))
132+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestFASGof))
133+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestSDSUMOGof))
134+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestAndersonGof))
135+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestRZZ2015))
136+
TS.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestAS16))
137137

138138
# Done, run the tests
139139
print("==> Running BBP Unit Tests...")

0 commit comments

Comments
 (0)