From 9ada7fc31fef09a524e5f55e609838e0d09b56d7 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 15 Nov 2023 14:18:56 +0100 Subject: [PATCH] changing branche --- .github/workflows/build_wheels.yml | 2 +- CHANGELOG.md | 7 ++++++- README.md | 4 ++-- dev/set_version_config.txt | 2 +- dev/sphinx/source/conf.py | 2 +- dev/test_start.py | 7 +++++-- lucit_licensing_python/manager.py | 16 ++++++++++------ meta.yaml | 6 +++--- pyproject.toml | 2 +- setup.py | 2 +- 10 files changed, 31 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 143d560..47485c5 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -67,7 +67,7 @@ jobs: generate_release_notes: true name: lucit-licensing-python prerelease: false - tag_name: 1.8.0 + tag_name: 1.8.1 token: ${{ secrets.GITHUB_TOKEN }} - name: Create PyPi Release diff --git a/CHANGELOG.md b/CHANGELOG.md index 29f73c0..a683ff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p [How to upgrade to the latest version!](https://lucit-licensing-python.docs.lucit.tech/readme.html#installation-and-upgrade) -## 1.8.0.dev (development stage/unreleased/unstable) +## 1.8.1.dev (development stage/unreleased/unstable) + +## 1.8.1 +### Fixed +- Typing of `manager.__init__()` parameters + ## 1.8.0 - Building conda packages and distribute them via https://anaconda.org/lucit diff --git a/README.md b/README.md index 5ed576a..012e644 100644 --- a/README.md +++ b/README.md @@ -274,10 +274,10 @@ Run in bash: `pip install https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/archive/$(curl -s https://api.github.com/repos/LUCIT-Systems-and-Development/lucit-licensing-python/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")').tar.gz --upgrade` #### Windows -Use the below command with the version (such as 1.8.0) you determined +Use the below command with the version (such as 1.8.1) you determined [here](https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/releases/latest): -`pip install https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/archive/1.8.0.tar.gz --upgrade` +`pip install https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/archive/1.8.1.tar.gz --upgrade` ### From the latest source (dev-stage) with PIP from [GitHub](https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python) This is not a release version and can not be considered to be stable! diff --git a/dev/set_version_config.txt b/dev/set_version_config.txt index 0810f0f..138b23c 100644 --- a/dev/set_version_config.txt +++ b/dev/set_version_config.txt @@ -1,2 +1,2 @@ -1.8.0 +1.8.1 meta.yaml,pyproject.toml,setup.py,README.md,.github/workflows/build_wheels.yml,dev/sphinx/source/conf.py,lucit_licensing_python/manager.py diff --git a/dev/sphinx/source/conf.py b/dev/sphinx/source/conf.py index 3058d81..b822acd 100644 --- a/dev/sphinx/source/conf.py +++ b/dev/sphinx/source/conf.py @@ -27,7 +27,7 @@ # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '1.8.0' +release = '1.8.1' html_last_updated_fmt = "%b %d %Y at %H:%M (CET)" diff --git a/dev/test_start.py b/dev/test_start.py index 84c8b13..7afe38b 100644 --- a/dev/test_start.py +++ b/dev/test_start.py @@ -16,10 +16,13 @@ class LTC: def __init__(self): self.sigterm = False - self.llm = LucitLicensingManager(parent_shutdown_function=self.close, + self.llm = LucitLicensingManager(api_secret=None, + license_ini=None, + license_profile=None, + license_token=None, + parent_shutdown_function=self.close, program_used="unicorn-binance-websocket-api", needed_license_type="UNICORN-BINANCE-SUITE", - license_profile="LUCIT", start=True) licensing_exception = self.llm.get_license_exception() if licensing_exception is not None: diff --git a/lucit_licensing_python/manager.py b/lucit_licensing_python/manager.py index 0c5c675..b9f3ae4 100644 --- a/lucit_licensing_python/manager.py +++ b/lucit_licensing_python/manager.py @@ -33,7 +33,7 @@ from pathlib import Path from requests.exceptions import ConnectionError, RequestException, HTTPError from simplejson.errors import JSONDecodeError -from typing import Callable +from typing import Optional, Callable try: from exceptions import NoValidatedLucitLicense except ModuleNotFoundError: @@ -43,13 +43,17 @@ class LucitLicensingManager(threading.Thread): - def __init__(self, api_secret: str = None, license_token: str = None, - license_ini: str = None, license_profile: str = None, - program_used: str = None, start: bool = True, + def __init__(self, + api_secret: Optional[str] = None, + license_token: Optional[str] = None, + license_ini: Optional[str] = None, + license_profile: Optional[str] = None, + program_used: Optional[str] = None, + start: bool = True, parent_shutdown_function: Callable[[bool], bool] = None, - needed_license_type: str = None): + needed_license_type: Optional[str] = None): super().__init__() - self.module_version: str = "1.8.0" + self.module_version: str = "1.8.1" self.parent_shutdown_function = parent_shutdown_function self.is_started = start self.sigterm = False diff --git a/meta.yaml b/meta.yaml index 392c263..ffe5e60 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,5 +1,5 @@ {% set name = "lucit-licensing-python" %} -{% set version = "1.8.0" %} +{% set version = "1.8.1" %} package: name: {{ name|lower }} @@ -325,10 +325,10 @@ about: `pip install https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/archive/$(curl -s https://api.github.com/repos/LUCIT-Systems-and-Development/lucit-licensing-python/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")').tar.gz --upgrade` #### Windows - Use the below command with the version (such as 1.8.0) you determined + Use the below command with the version (such as 1.8.1) you determined [here](https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/releases/latest): - `pip install https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/archive/1.8.0.tar.gz --upgrade` + `pip install https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python/archive/1.8.1.tar.gz --upgrade` ### From the latest source (dev-stage) with PIP from [GitHub](https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python) This is not a release version and can not be considered to be stable! diff --git a/pyproject.toml b/pyproject.toml index f30606d..2ad2062 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "lucit-licensing-python" -version = "1.8.0" +version = "1.8.1" description = "LUCIT Licensing Client Module" authors = ["LUCIT Systems and Development "] license = "LSOSL - LUCIT Synergetic Open Source License" diff --git a/setup.py b/setup.py index fc3f0fc..bc6443a 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ 'lucit_licensing_python/manager.py'], annotate=False), name='lucit-licensing-python', - version="1.8.0", + version="1.8.1", author="LUCIT Systems and Development", author_email='info@lucit.tech', url="https://github.com/LUCIT-Systems-and-Development/lucit-licensing-python",