nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-27 19:04:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2990 from branchvincent/pyproject

Browse Source 
Make pyproject.toml's version dynamic
This commit is contained in:
Nicolas Hennion 2024-10-24 08:13:26 +02:00 committed by GitHub
commit ff1cde4ffb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker-files/alpine.Dockerfile
View File

@ -70,7 +70,6 @@ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-re
##############################################################################
# BUILD: Install the minimal image deps
# Minimal in Docker mean: Docker + WebUI
FROM build as buildMinimal
ARG PYTHON_VERSION
@ -104,10 +103,6 @@ ARG PYTHON_VERSION
COPY ./docker-compose/glances.conf /etc/glances/glances.conf
COPY ./glances/. /app/glances/
# Copy pyproject file in order to have the version
# Note: Glances is not installed as a Pypi pkg in Docker
COPY ./pyproject.toml /app
# Copy binary and update PATH
COPY docker-bin.sh /usr/local/bin/glances
RUN chmod a+x /usr/local/bin/glances

5
docker-files/ubuntu.Dockerfile
View File

@ -59,7 +59,6 @@ COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-re
##############################################################################
# BUILD: Install the minimal image deps
# Minimal in Docker mean: Docker + WebUI
FROM build as buildMinimal
ARG PYTHON_VERSION
@ -88,10 +87,6 @@ ARG PYTHON_VERSION
COPY ./docker-compose/glances.conf /etc/glances/glances.conf
COPY ./glances/. /app/glances/
# Copy pyproject file in order to have the version
# Note: Glances is not installed as a Pypi pkg in Docker
COPY ./pyproject.toml /app
# Copy binary and update PATH
COPY docker-bin.sh /usr/local/bin/glances
RUN chmod a+x /usr/local/bin/glances

19
glances/__init__.py
View File

@ -11,30 +11,15 @@
# Import system libs
import locale
import os
import platform
import re
import signal
import sys
import tracemalloc
from importlib import metadata
# Global name
# Version is now set in the pyproject.toml file
# and should start and end with a numerical char
# Version should start and end with a numerical char
# See https://packaging.python.org/specifications/core-metadata/#version
try:
# Read the version from the metadata (when deployed with Pypi)
__version__ = metadata.version("glances")
except metadata.PackageNotFoundError:
if os.path.exists('pyproject.toml'):
# In local try to read the version in the pyproject.toml file
# Dirty but it make the job
with open('pyproject.toml', encoding='utf-8') as f:
__version__ = re.search(r"^version = ['\"]([^'\"]*)['\"]", f.read(), re.M).group(1)
else:
# Else set a unknown version
__version__ = "0.0.0+unknown"
__version__ = "4.3.0_dev02"
__apiversion__ = '4'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPLv3'

5
pyproject.toml
View File

@ -29,13 +29,13 @@ dependencies = [
"requests; platform_system == 'Windows'",
]
description = "A cross-platform curses-based monitoring tool"
dynamic = ["version"]
keywords = ["cli", "curses", "monitoring", "system"]
license = {text = "LGPLv3"}
name = "Glances"
readme = "README.rst"
requires-python = ">=3.8"
urls.Homepage = "https://github.com/nicolargo/glances"
version = "4.3.0_dev02"
[project.optional-dependencies]
action = ["chevron"]
@ -86,6 +86,9 @@ glances = "glances:main"
]
"share/man/man1" = ["docs/man/glances.1"]
[tool.setuptools.dynamic]
version = { attr = "glances.__version__" }
[tool.setuptools.packages.find]
include = ["glances*"]