erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

version: use standard Python's dev0 instead of Libervia specific D for dev version

Browse source
This commit is contained in:
Goffi 2023-06-06 12:41:53 +02:00
commit b7618e12f7
6 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libervia/backend/__init__.py
View file

@ -15,12 +15,9 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import os.path
from sat_tmp import wokkel from sat_tmp import wokkel
version_file = os.path.join(os.path.dirname(__file__), "VERSION") __version__ = "0.9.0.dev0"
with open(version_file) as f:
__version__ = f.read().strip()
if not wokkel.installed: if not wokkel.installed:
wokkel.install() wokkel.install()

2
libervia/backend/core/constants.py
View file

@ -36,7 +36,7 @@ class Const(object):
APP_NAME_FULL = f"{APP_NAME} ({APP_COMPONENT})" APP_NAME_FULL = f"{APP_NAME} ({APP_COMPONENT})"
APP_VERSION = ( APP_VERSION = (
backend.__version__ backend.__version__
) # Please add 'D' at the end of version in sat/VERSION for dev versions )
APP_RELEASE_NAME = "La Ruche" APP_RELEASE_NAME = "La Ruche"
APP_URL = "https://libervia.org" APP_URL = "https://libervia.org"

2
libervia/backend/core/main.py
View file

@ -113,7 +113,7 @@ class LiberviaBackend(service.Service):
In developement mode, release name and extra data are returned too In developement mode, release name and extra data are returned too
""" """
version = self.version version = self.version
if version[-1] == "D": if version.split(".")[-1] == "dev0":
# we are in debug version, we add extra data # we are in debug version, we add extra data
try: try:
return self._version_cache return self._version_cache

1
libervia/backend/tools/utils.py
View file

@ -321,7 +321,6 @@ def get_repository_data(module, as_string=True, is_path=False):
) )
) )
else: else:
version = version.replace(".dev0", "D")
if version != C.APP_VERSION: if version != C.APP_VERSION:
log.warning( log.warning(
"Incompatible version ({version}) and pkg_version ({pkg_version})" "Incompatible version ({version}) and pkg_version ({pkg_version})"

2
libervia/tui/base.py
View file

@ -483,7 +483,7 @@ class LiberviaTUIApp(QuickApp, InputHistory):
self.loop.widget = self.__saved_overlay self.loop.widget = self.__saved_overlay
self.__saved_overlay = None self.__saved_overlay = None
elif input_ == a_key['DEBUG'] and 'D' in self.bridge.version_get(): #Debug only for dev versions elif input_ == a_key['DEBUG'] and '.dev0' in self.bridge.version_get(): #Debug only for dev versions
self.debug() self.debug()
elif input_ == a_key['CONTACTS_HIDE']: #user wants to (un)hide the contact lists elif input_ == a_key['CONTACTS_HIDE']: #user wants to (un)hide the contact lists
try: try:

4
setup.py
View file

@ -73,7 +73,7 @@ DBUS_DIR = 'dbus-1/services'
DBUS_FILE = 'misc/org.libervia.Libervia.service' DBUS_FILE = 'misc/org.libervia.Libervia.service'
with open(os.path.join(DIR_NAME, 'VERSION')) as f: with open(os.path.join(DIR_NAME, 'VERSION')) as f:
VERSION = f.read().strip() VERSION = f.read().strip()
is_dev_version = VERSION.endswith('D') is_dev_version = VERSION.endswith('.dev0')
if is_dev_version: if is_dev_version:
install_requires.append("setuptools_scm") install_requires.append("setuptools_scm")
@ -81,7 +81,7 @@ if is_dev_version:
def sat_dev_version(): def sat_dev_version():
"""Use mercurial data to compute version""" """Use mercurial data to compute version"""
def version_scheme(version): def version_scheme(version):
return VERSION.replace('D', '.dev0') return VERSION
def local_scheme(version): def local_scheme(version):
return "+{rev}.{distance}".format( return "+{rev}.{distance}".format(