diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d46497dbc2a8e4bd592843ded465624b29adfc66..b7b2db13cb5fbb0cb49a9dd5de54a41cb0bc522b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,16 @@ -stages: +stages: + - run - image + +test-run: + stage: run + image: python:3.11 + before_script: + - pip3 install -r requirements.txt + - python3 setup.py install + script: + - hwtr -h + docker-build: stage: image image: docker:latest diff --git a/pypcc/pypcc.py b/pypcc/pypcc.py index af1cb0353aab3f2102e5c1ccdb99ed43c443d929..1e121cad119363e3d9e633512116fd602fdb0f28 100755 --- a/pypcc/pypcc.py +++ b/pypcc/pypcc.py @@ -1,10 +1,10 @@ -import logging +from importlib import metadata import argparse +import logging +import signal +import sys import threading import time -import sys -import signal -from importlib_metadata import metadata parser = argparse.ArgumentParser() parser.add_argument("-s", "--simulator", help="Do not connect to I2c, but simulate behaviour.", action="store_true") @@ -26,7 +26,7 @@ args = parser.parse_args() #} #configure_logger(logstash_host=args.loghost,level=args.loglevel, log_extra=log_extra) logging.getLogger().setLevel(args.loglevel) -git_hash=metadata("pypcc")["Summary"] +git_hash=metadata.metadata("pypcc")["Summary"] logging.info("Git Hash="+git_hash) from pypcc.opcuaserv import opcuaserv diff --git a/requirements.txt b/requirements.txt index 7d582b2e15ba4dfb21616407bb68007c674b35f0..eb6844a3ec8bf635c146b4457429784b0773badb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -git+https://github.com/amaork/libi2c.git; platform_system == "linux" +git+https://github.com/amaork/libi2c.git; platform_system == "Linux" asyncua numpy recordclass