From 4bf031a6c7a4a9d31dc06ef7105018a40ba43c2e Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 23 Apr 2021 19:42:45 +0200 Subject: [PATCH] small fixes in api requests for double elimination --- build_deb.sh | 6 +++--- compLib/Api.py | 10 +++++----- compLib/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build_deb.sh b/build_deb.sh index 9b8dc6b..7bd753b 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -1,8 +1,8 @@ -#!/usr/bin/bash +##!/usr/bin/zsh export PYTHONDONTWRITEBYTECODE=1 # be sure to change version if needed! -fpm -s python --python-bin python3.7 --python-pip pip3.7 --python-package-name-prefix python3 \ +fpm -s python --python-bin python3 --python-pip pip3 --python-package-name-prefix python3 \ -m '"Joel Klimont" ' \ --license 'proprietary' \ --description 'Library for robot used in the competition' \ @@ -34,7 +34,7 @@ fpm -s python --python-bin python3.7 --python-pip pip3.7 --python-package-name-p -d "python3-pigpio" \ -d "python3-numpy" \ -d "ffmpeg" \ - -v 0.1.5-0 -t deb setup.py + -v 0.1.5-1 -t deb setup.py # --deb-changelog changelog \ # --deb-upstream-changelog changelog \ diff --git a/compLib/Api.py b/compLib/Api.py index 25f3e33..f7aaf34 100644 --- a/compLib/Api.py +++ b/compLib/Api.py @@ -89,7 +89,7 @@ class DoubleElim: if res.status_code == 408: Logging.get_logger().error(f"DoubleElim.get_position timeout!") time.sleep(0.01) - return get_position() + return DoubleElim.get_position() response = json.loads(res.content) Logging.get_logger().debug(f"DoubleElim.get_position = {response}, status code = {res.status_code}") @@ -106,7 +106,7 @@ class DoubleElim: if res.status_code == 408: Logging.get_logger().error(f"DoubleElim.get_opponent timeout!") time.sleep(0.01) - return get_opponent() + return DoubleElim.get_opponent() response = json.loads(res.content) Logging.get_logger().debug(f"DoubleElim.get_opponent = x:{response}, status code = {res.status_code}") @@ -123,7 +123,7 @@ class DoubleElim: if res.status_code == 408: Logging.get_logger().error(f"DoubleElim.get_goal timeout!") time.sleep(0.01) - return get_goal() + return DoubleElim.get_goal() response = json.loads(res.content) Logging.get_logger().debug(f"DoubleElim.get_goal = {response}, status code = {res.status_code}") @@ -140,7 +140,7 @@ class DoubleElim: if res.status_code == 408: Logging.get_logger().error(f"DoubleElim.get_items timeout!") time.sleep(0.01) - return get_items() + return DoubleElim.get_items() response = json.loads(res.content) Logging.get_logger().debug(f"DoubleElim.get_items = {response}, status code = {res.status_code}") @@ -157,7 +157,7 @@ class DoubleElim: if res.status_code == 408: Logging.get_logger().error(f"DoubleElim.get_scores timeout!") time.sleep(0.01) - return get_scores() + return DoubleElim.get_scores() response = json.loads(res.content) Logging.get_logger().debug(f"DoubleElim.get_scores = {response}, status code = {res.status_code}") diff --git a/compLib/__init__.py b/compLib/__init__.py index 67a8de8..649f355 100644 --- a/compLib/__init__.py +++ b/compLib/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.1.5-0" +__version__ = "0.1.5-1" import compLib.LogstashLogging import logging diff --git a/setup.py b/setup.py index 9390db0..a3ab080 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ else: setuptools.setup( name="complib", - version="0.1.5-0", + version="0.1.5-1", author="F-WuTs", author_email="--", description="",