Skip to content

Commit 644844d

Browse files
committed
updating file import method to solve deprecation issue in py312
1 parent c4c8f84 commit 644844d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ jedi
1313
parso
1414
ipython
1515
requests
16+
backports.ssl_match_hostname

src/fortygbe.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import logging
22
import time
33
import struct
4-
from pkg_resources import resource_filename
4+
import importlib.resources as resources
55

66
from .network import IpAddress, Mac
77
from .tengbe import TenGbe, read_memory_map_definition
88

9-
TENGBE_UNIFIED_MMAP_TXT = resource_filename('casperfpga', 'tengbe_mmap.txt')
10-
FORTYGBE_MMAP_LEGACY_TXT = resource_filename('casperfpga', 'tengbe_mmap_legacy.txt')
9+
TENGBE_UNIFIED_MMAP_TXT = resources.files('casperfpga') / 'tengbe_mmap.txt'
10+
TENGBE_MMAP_LEGACY_TXT = resources.files('casperfpga') / 'fortygbe_mmap_legacy.txt'
1111

1212

1313
class FortyGbe(TenGbe):

src/tengbe.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import logging
22
import struct
33
import numpy as np
4+
import importlib.resources as resources
45

5-
from pkg_resources import resource_filename
66
from .memory import Memory
77
from .network import Mac, IpAddress
88
from .gbe import Gbe
@@ -12,8 +12,8 @@
1212
STRUCT_CTYPES = {1: 'B', 2: 'H', 4: 'L', 8: 'Q'}
1313
STRUCT_CTYPES_TO_B = {'B': 1, 'H': 2, 'L': 4, 'Q': 8}
1414

15-
TENGBE_UNIFIED_MMAP_TXT = resource_filename('casperfpga', 'tengbe_mmap.txt')
16-
TENGBE_MMAP_LEGACY_TXT = resource_filename('casperfpga', 'tengbe_mmap_legacy.txt')
15+
TENGBE_UNIFIED_MMAP_TXT = resources.files('casperfpga') / 'tengbe_mmap.txt'
16+
TENGBE_MMAP_LEGACY_TXT = resources.files('casperfpga') / 'tengbe_mmap_legacy.txt'
1717

1818
# Offsets for fields in the memory map, in bytes
1919
OFFSET_CORE_TYPE = 0x0

0 commit comments

Comments
 (0)