Skip to content

Commit eb271bd

Browse files
committed
Enabling package build and upload
1 parent 695b647 commit eb271bd

21 files changed

+58
-37
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
.vscode/
2+
dist/
3+
someipy.egg-info/
24
__pycache__

example_apps/send_events.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
import sys
2-
sys.path.append("..")
3-
41
import asyncio
52
import ipaddress
63
import logging
74

8-
import src.service_discovery
9-
import src._internal.someip_header
10-
import src._internal.someip_sd_header
11-
import src.server_service_instance
12-
from src.logging import set_someipy_log_level
13-
from src.serialization import Uint8, Uint64, Float32
5+
from someipy.service_discovery import construct_service_discovery
6+
from someipy.server_service_instance import ServerServiceInstance
7+
from someipy.logging import set_someipy_log_level
8+
from someipy.serialization import Uint8, Uint64, Float32
149
from temperature_msg import TemparatureMsg
1510

1611
SD_MULTICAST_GROUP = "224.224.224.245"
@@ -28,15 +23,15 @@ async def main():
2823
# Since the construction of the class ServiceDiscoveryProtocol is not trivial and would require an async __init__ function
2924
# use the construct_service_discovery function
3025
# The local interface IP address needs to be passed so that the src-address of all SD UDP packets is correctly set
31-
service_discovery = await src.service_discovery.construct_service_discovery(SD_MULTICAST_GROUP, SD_PORT, INTERFACE_IP)
26+
service_discovery = await construct_service_discovery(SD_MULTICAST_GROUP, SD_PORT, INTERFACE_IP)
3227

3328
# 1. For sending events use a ServerServiceInstance
3429
# 2. Pass the service and instance ID, version and endpoint and TTL. The endpoint is needed again as the src-address
3530
# and port of all sent events
3631
# 3. The ServiceDiscoveryProtocol object has to be passed as well, so the ServerServiceInstance can offer his service to
3732
# other ECUs
3833
# 4. cyclic_offer_delay_ms is the period of sending cyclic SD Offer service entries
39-
service_instance_temperature = src.server_service_instance.ServerServiceInstance(
34+
service_instance_temperature = ServerServiceInstance(
4035
service_id=1,
4136
instance_id=1000,
4237
major_version=1,
@@ -52,7 +47,7 @@ async def main():
5247
service_discovery.attach(service_instance_temperature)
5348

5449
# For demonstration purposes we will construct a second ServerServiceInstance
55-
service_instance_2 = src.server_service_instance.ServerServiceInstance(
50+
service_instance_2 = ServerServiceInstance(
5651
service_id=2,
5752
instance_id=2000,
5853
major_version=1,

example_apps/temperature_msg.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import sys
2-
sys.path.append("..")
3-
4-
from src.serialization import *
1+
from someipy.serialization import *
52

63
# With someipy it's possible to either send and receive payloads unserialized simply as bytes-objects
74
# You can also define the payloads structure directly as Python classes and serialize your Python object

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ['setuptools>=42']
3+
build-backend = 'setuptools.build_meta'

setup.cfg

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[metadata]
2+
name = someipy
3+
version = 0.0.0
4+
author = Christian H.
5+
author_email = someipy.package@gmail.com
6+
description = A Python package implementing the SOME/IP protocol
7+
long_description = file: README.md
8+
long_description_content_type = text/markdown
9+
url = https://github.com/chrizog/someipy
10+
project_urls =
11+
Bug Tracker = https://github.com/chrizog/someipy/issues
12+
Repository = https://github.com/chrizog/someipy
13+
classifiers =
14+
Intended Audience :: Developers
15+
Operating System :: POSIX :: Linux
16+
Programming Language :: Python :: 3.12
17+
18+
[options]
19+
package_dir =
20+
= src
21+
packages = find:
22+
python_requires = >=3.12
23+
24+
[options.packages.find]
25+
where = src
File renamed without changes.
File renamed without changes.

src/_internal/logging.py renamed to src/someipy/_internal/logging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from src.logging import get_someipy_log_level
2+
from someipy.logging import get_someipy_log_level
33

44
def get_logger(name: str) -> logging.Logger:
55
logger = logging.getLogger("someipy." + name)

src/_internal/service_discovery_abcs.py renamed to src/someipy/_internal/service_discovery_abcs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from abc import ABC, abstractmethod
2-
from src._internal.someip_sd_header import *
3-
from src._internal.session_handler import SessionHandler
2+
from someipy._internal.someip_sd_header import *
3+
from someipy._internal.session_handler import SessionHandler
44

55

66
class ServiceDiscoveryObserver(ABC):

src/_internal/simple_timer.py renamed to src/someipy/_internal/simple_timer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import time
33

44

5-
65
class SimplePeriodicTimer():
76
def __init__(self, period, callback):
87
self._period = period

src/_internal/someip_sd_header.py renamed to src/someipy/_internal/someip_sd_header.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from dataclasses import dataclass
55
from typing import List, Tuple, TypeVar, Union
66

7-
from src._internal.utils import set_bit_at_position, is_bit_set
8-
from src._internal.someip_header import SomeIpHeader
7+
from someipy._internal.utils import set_bit_at_position, is_bit_set
8+
from someipy._internal.someip_header import SomeIpHeader
99

1010
# Constants for byte positions inside the SD header
1111
SD_POSITION_ENTRY_LENGTH = 20
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/server_service_instance.py renamed to src/someipy/server_service_instance.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
from dataclasses import dataclass
22
from typing import List
33

4-
from src.service_discovery import *
5-
from src._internal.message_types import MessageType
6-
from src._internal.someip_sd_builder import *
7-
from src._internal.someip_header import SomeIpHeader
8-
from src._internal.someip_sd_header import (
4+
from someipy.service_discovery import *
5+
from someipy._internal.message_types import MessageType
6+
from someipy._internal.someip_sd_builder import *
7+
from someipy._internal.someip_header import SomeIpHeader
8+
from someipy._internal.someip_sd_header import (
99
SdService,
1010
TransportLayerProtocol,
1111
SdEventGroupEntry,
1212
)
1313

14-
from src._internal.simple_timer import SimplePeriodicTimer
15-
from src._internal.utils import (
14+
from someipy._internal.simple_timer import SimplePeriodicTimer
15+
from someipy._internal.utils import (
1616
create_udp_socket,
1717
endpoint_to_str_int_tuple,
1818
EndpointType,
1919
)
20-
from src._internal.logging import get_logger
20+
from someipy._internal.logging import get_logger
2121

2222
_logger = get_logger("server_service_instance")
2323

src/service_discovery.py renamed to src/someipy/service_discovery.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
import ipaddress
33
from typing import Any, Union, Tuple, List
44

5-
from src._internal.someip_header import SomeIpHeader
6-
from src._internal.someip_sd_header import *
7-
from src._internal.someip_sd_extractors import *
8-
from src._internal.session_handler import SessionHandler
9-
from src._internal.utils import (
5+
from someipy._internal.someip_header import SomeIpHeader
6+
from someipy._internal.someip_sd_header import *
7+
from someipy._internal.someip_sd_extractors import *
8+
from someipy._internal.session_handler import SessionHandler
9+
from someipy._internal.utils import (
1010
create_rcv_multicast_socket,
1111
create_udp_socket,
1212
DatagramAdapter,
1313
)
14-
from src._internal.service_discovery_abcs import *
15-
from src._internal.logging import get_logger
14+
from someipy._internal.service_discovery_abcs import *
15+
from someipy._internal.logging import get_logger
1616

1717
_logger = get_logger("service_discovery")
1818

0 commit comments

Comments
 (0)