Skip to content

Commit bae7c21

Browse files
authored
fix pypy311 registered, update travis ci (#741)
1 parent 7daa95d commit bae7c21

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
dist: jammy
1+
dist: noble
22
language: python
33

44
matrix:
55
include:
66
- python: '3.9'
77
dist: focal
88
env:
9-
- COVERAGE="true"
10-
- NUMPY="true"
119

1210
- python: '3.10'
11+
dist: jammy
1312
env:
13+
- COVERAGE="true"
14+
- NUMPY="true"
1415

1516
- python: '3.11'
17+
dist: jammy
1618
env:
1719

1820
- python: '3.12'
@@ -21,10 +23,10 @@ matrix:
2123
- python: '3.13'
2224
env:
2325

24-
- python: '3.14-dev'
26+
- python: '3.14'
2527
env:
2628

27-
- python: '3.15-dev'
29+
- python: '3.15t-dev'
2830
env:
2931

3032
- python: 'pypy3.9-7.3.15' # at 7.3.16
@@ -37,8 +39,7 @@ matrix:
3739
env:
3840

3941
allow_failures:
40-
- python: '3.15-dev' # prerelease; CI missing
41-
- python: 'pypy3.11-7.3.20' # CI missing
42+
- python: '3.15t-dev' # prerelease
4243
fast_finish: true
4344

4445
cache:

dill/_objects.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class _Struct(ctypes.Structure):
176176
a['OptionGroupType'] = optparse.OptionGroup(_oparser,"foo") # pickle ok
177177
a['OptionType'] = optparse.Option('--foo') # pickle ok
178178
if HAS_CTYPES:
179-
z = x if IS_PYPY else a
179+
z = x if (IS_PYPY and sys.hexversion < 0x30b0df0) else a
180180
z['CCharType'] = _cchar = ctypes.c_char()
181181
z['CWCharType'] = ctypes.c_wchar() # fail == 2.6
182182
z['CByteType'] = ctypes.c_byte()
@@ -218,7 +218,7 @@ class _Struct(ctypes.Structure):
218218
a['UnicodeIOType'] = TextIO() # the new StringIO
219219
a['LoggerAdapterType'] = logging.LoggerAdapter(_logger,_dict) # pickle ok
220220
if HAS_CTYPES:
221-
z = x if IS_PYPY else a
221+
z = x if (IS_PYPY and sys.hexversion < 0x30b0df0) else a
222222
z['CBoolType'] = ctypes.c_bool(1)
223223
z['CLongDoubleType'] = ctypes.c_longdouble()
224224
del z
@@ -227,7 +227,7 @@ class _Struct(ctypes.Structure):
227227
a['OrderedDictType'] = collections.OrderedDict(_dict)
228228
a['CounterType'] = collections.Counter(_dict)
229229
if HAS_CTYPES:
230-
z = x if IS_PYPY else a
230+
z = x if (IS_PYPY and sys.hexversion < 0x30b0df0) else a
231231
z['CSSizeTType'] = ctypes.c_ssize_t()
232232
del z
233233
# generic operating system services (CH 15)

0 commit comments

Comments
 (0)