Restore version info in the metadata file

This commit is contained in:
Dimitris Zlatanidis 2017-02-17 23:27:59 +02:00
parent bc99bd5086
commit 59815ae801
5 changed files with 4 additions and 30 deletions

View file

@ -28,7 +28,7 @@
__version() { __version() {
# Grab version from __metadata_.py file # Grab version from __metadata_.py file
cat slpkg/version_info.py | grep "__version_info__ = (" \ cat slpkg/__metadata__.py | grep "__version_info__ = (" \
| tr -d [[:space:]] | cut -c19-23 | tr , . | tr -d [[:space:]] | cut -c19-23 | tr , .
} }

View file

@ -24,7 +24,7 @@
__version() { __version() {
# Grab version from __metadata_.py file # Grab version from __metadata_.py file
cat ../slpkg/version_info.py | grep "__version_info__ = (" \ cat ../slpkg/__metadata__.py | grep "__version_info__ = (" \
| tr -d [[:space:]] | cut -c19-23 | tr , . | tr -d [[:space:]] | cut -c19-23 | tr , .
} }

View file

@ -23,7 +23,6 @@
import os import os
from version_info import __version_info__
def remove_repositories(repositories, default_repositories): def remove_repositories(repositories, default_repositories):
@ -79,6 +78,7 @@ class MetaData(object):
__all__ = "slpkg" __all__ = "slpkg"
__author__ = "dslackw" __author__ = "dslackw"
__version_info__ = (3, 2, 5)
__version__ = "{0}.{1}.{2}".format(*__version_info__) __version__ = "{0}.{1}.{2}".format(*__version_info__)
__license__ = "GNU General Public License v3 (GPLv3)" __license__ = "GNU General Public License v3 (GPLv3)"
__email__ = "d.zlatanidis@gmail.com" __email__ = "d.zlatanidis@gmail.com"

View file

@ -42,7 +42,7 @@ def it_self_update():
repository = "github" repository = "github"
branch = "master" branch = "master"
ver_link = ("https://raw.{0}usercontent.com/{1}/{2}/" ver_link = ("https://raw.{0}usercontent.com/{1}/{2}/"
"{3}/{4}/version_info.py".format(repository, _meta_.__author__, "{3}/{4}/__metadata__.py".format(repository, _meta_.__author__,
_meta_.__all__, branch, _meta_.__all__, branch,
_meta_.__all__)) _meta_.__all__))
version_data = URL(ver_link).reading() version_data = URL(ver_link).reading()

View file

@ -1,26 +0,0 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# version_info.py file is part of slpkg.
# Copyright 2014-2017 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved.
# Slpkg is a user-friendly package manager for Slackware installations
# https://github.com/dslackw/slpkg
# Slpkg is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Include version info
__version_info__ = (3, 2, 5)