Skip to content

Commit

Permalink
changing branche
Browse files Browse the repository at this point in the history
  • Loading branch information
oliver-zehentleitner committed Nov 15, 2023
1 parent 2db01d8 commit 9ada7fc
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
2 changes: 1 addition & 1 deletion dev/set_version_config.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion dev/sphinx/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
7 changes: 5 additions & 2 deletions dev/test_start.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 10 additions & 6 deletions lucit_licensing_python/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "lucit-licensing-python" %}
{% set version = "1.8.0" %}
{% set version = "1.8.1" %}

package:
name: {{ name|lower }}
Expand Down Expand Up @@ -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!
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <info@lucit.tech>"]
license = "LSOSL - LUCIT Synergetic Open Source License"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 9ada7fc

Please sign in to comment.