From dcffeef03e2c4975de1607889c6d04b1d5ef4069 Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Garcia Date: Fri, 7 Jun 2024 14:20:04 +0200 Subject: [PATCH] fix: do not use PBR to get version Since we have moved to Poetry, and we are using release-please in GH, we do not need to use anymore pbr, but rather rely on the versions that are change by the GH action. Fixes #153 --- deepaas/__init__.py | 4 +--- deepaas/version.py | 22 ---------------------- doc/source/conf.py | 6 +++--- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 deepaas/version.py diff --git a/deepaas/__init__.py b/deepaas/__init__.py index 0df3b22d..d37785b8 100644 --- a/deepaas/__init__.py +++ b/deepaas/__init__.py @@ -14,6 +14,4 @@ # License for the specific language governing permissions and limitations # under the License. -from deepaas import version - -__version__ = version.release_string +__version__ = "2.3.2" diff --git a/deepaas/version.py b/deepaas/version.py deleted file mode 100644 index 1488deaa..00000000 --- a/deepaas/version.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2018 Spanish National Research Council (CSIC) -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import pbr.version - -version_info = pbr.version.VersionInfo("deepaas") - -version_string = version_info.version_string() -release_string = version_info.release_string() diff --git a/doc/source/conf.py b/doc/source/conf.py index 12418030..120aab6c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -19,7 +19,7 @@ import os import sys -from deepaas import version +import deepaas # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -68,9 +68,9 @@ # built documents. # # The full version, including alpha/beta/rc tags. -release = version.release_string +release = deepaas.__version__ # The short X.Y version. -version = version.release_string +version = deepaas.__version__ # A list of glob-style patterns that should be excluded when looking for # source files. They are matched against the source file names relative to the