From cc9a31389371de192cee7b034c49a66df38bba65 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 9 Apr 2024 18:16:46 +0200
Subject: [PATCH] Python library versioning fix
---
.gitlab-ci.yml | 2 +-
lib/python/README.md | 53 ++++++++++++++++++++-------------------
lib/python/pyproject.toml | 2 +-
lib/python/setup.py | 2 +-
4 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a70525dba8..502c4be5b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -577,7 +577,7 @@ release-libs:
- pip install pipenv
- pipenv install gunicorn && pipenv install --dev --system --deploy
- pip install twine build
- - 'sed -i -e "s/__APPVERSION__/${APP_VERSION}rc18/g" ./lib/python/pyproject.toml ./lib/python/setup.py ./lib/python/README.md'
+ - 'sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" ./lib/python/pyproject.toml ./lib/python/setup.py ./lib/python/README.md'
- python -m build --sdist ./lib/python
- python -m build --wheel ./lib/python
- printf "[diskutils]\nindex-servers =\n pypi\n\n[pypi]\nusername = __token__\npassword = ${CI_PIPY_TOKEN}\nrepository = https://upload.pypi.org/legacy/" > .pypirc
diff --git a/lib/python/README.md b/lib/python/README.md
index 29e913da7b..0cb742a451 100644
--- a/lib/python/README.md
+++ b/lib/python/README.md
@@ -32,32 +32,33 @@ print(f"Analysis result: {analysis}")
# create table
table = client.create_table(database_id=1,
- name="Sensor Data",
- constraints=CreateTableConstraints(checks=['precipitation >= 0'],
- uniques=[['precipitation']]),
- columns=[CreateTableColumn(name="date",
- type=ColumnType.DATE,
- dfid=3, # YYYY-MM-dd
- primary_key=True,
- null_allowed=False),
- CreateTableColumn(name="precipitation",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True),
- CreateTableColumn(name="lat",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True),
- CreateTableColumn(name="lng",
- type=ColumnType.DECIMAL,
- size=10,
- d=4,
- primary_key=False,
- null_allowed=True)])
+ name="Sensor Data",
+ constraints=CreateTableConstraints(
+ checks=['precipitation >= 0'],
+ uniques=[['precipitation']]),
+ columns=[CreateTableColumn(name="date",
+ type=ColumnType.DATE,
+ dfid=3, # YYYY-MM-dd
+ primary_key=True,
+ null_allowed=False),
+ CreateTableColumn(name="precipitation",
+ type=ColumnType.DECIMAL,
+ size=10,
+ d=4,
+ primary_key=False,
+ null_allowed=True),
+ CreateTableColumn(name="lat",
+ type=ColumnType.DECIMAL,
+ size=10,
+ d=4,
+ primary_key=False,
+ null_allowed=True),
+ CreateTableColumn(name="lng",
+ type=ColumnType.DECIMAL,
+ size=10,
+ d=4,
+ primary_key=False,
+ null_allowed=True)])
print(f"Create table result {table}")
# -> (id=1, internal_name=sensor_data, ...)
diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml
index 0fa56b601c..6dfae10925 100644
--- a/lib/python/pyproject.toml
+++ b/lib/python/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "dbrepo"
-version = "1.4.2rc5"
+version = "__APPVERSION__"
description = "DBRepo Python Library"
keywords = [
"DBRepo",
diff --git a/lib/python/setup.py b/lib/python/setup.py
index 3f03bf8a3a..5f1c4834b4 100644
--- a/lib/python/setup.py
+++ b/lib/python/setup.py
@@ -2,7 +2,7 @@
from distutils.core import setup
setup(name="dbrepo",
- version="1.4.2rc5",
+ version="__APPVERSION__",
description="A library for communicating with DBRepo",
url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//",
author="Martin Weise",
--
GitLab