Skip to content

Commit e9abf1c

Browse files
committed
ORJson is not mandatory
2 parents 364a3ef + ee826a1 commit e9abf1c

14 files changed

+194
-144
lines changed

NEWS.rst

+21-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Version 4.0.0
77
===============
88

9-
See release note in Wiki format here: https://github.com/nicolargo/glances/wiki/Glances-4.0-Release-Note
9+
See release note in Wiki format: https://github.com/nicolargo/glances/wiki/Glances-4.0-Release-Note
1010

1111
**BREAKING CHANGES:**
1212

@@ -27,6 +27,26 @@ Glances version 4.x and higher:
2727
* Alert data model change from a list of list to a list of dict #2633
2828
* Docker memory usage uses the same algorithm than docker stats #2637
2929

30+
Special notes for package maintainers:
31+
32+
Minimal requirements for Glances version 4 are:
33+
34+
* psutil
35+
* defusedxml
36+
* packaging
37+
* ujson
38+
* pydantic
39+
* fastapi (for WebUI / RestFull API)
40+
* uvicorn (for WebUI / RestFull API)
41+
* jinja2 (for WebUI / RestFull API)
42+
43+
Majors changes between Glances version 3 and version 4:
44+
45+
* Bottle has been replaced by FastAPI and Uvicorn
46+
* CouchDB has been replaced by PyCouchDB
47+
* nvidia-ml-py has been replaced by py3nvml
48+
* pysnmp has been replaced by pysnmp-lextudio
49+
3050
Enhancements:
3151

3252
* Export individual processes stats #794

README.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ Optional dependencies:
110110
- ``jinja2`` (for templating, used under the hood by FastAPI)
111111
- ``kafka-python`` (for the Kafka export module)
112112
- ``netifaces`` (for the IP plugin)
113-
- ``orjson`` (fast JSON library, used under the hood by FastAPI)
114113
- ``nvidia-ml-py`` (for the GPU plugin)
115114
- ``pycouchdb`` (for the CouchDB export module)
116115
- ``pika`` (for the RabbitMQ/ActiveMQ export module)
@@ -224,6 +223,8 @@ Run last version of Glances container in *console mode*:
224223
225224
By default, the /etc/glances/glances.conf file is used (based on docker-compose/glances.conf).
226225

226+
By default, the /etc/glances/glances.conf file is used (based on docker-compose/glances.conf).
227+
227228
Additionally, if you want to use your own glances.conf file, you can
228229
create your own Dockerfile:
229230

@@ -325,7 +326,7 @@ Start Termux on your device and enter:
325326
$ apt update
326327
$ apt upgrade
327328
$ apt install clang python
328-
$ pip install fastapi uvicorn orjson jinja2
329+
$ pip install fastapi uvicorn jinja2
329330
$ pip install glances
330331
331332
And start Glances:

docker-files/alpine.Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ RUN apk add --no-cache \
6161
RUN python${PYTHON_VERSION} -m venv venv-build
6262
RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --upgrade pip
6363

64+
RUN python${PYTHON_VERSION} -m venv venv-build
65+
RUN /venv-build/bin/python${PYTHON_VERSION} -m pip install --upgrade pip
66+
6467
RUN python${PYTHON_VERSION} -m venv --without-pip venv
6568

6669
COPY requirements.txt docker-requirements.txt webui-requirements.txt optional-requirements.txt ./
@@ -105,6 +108,11 @@ COPY docker-bin.sh /usr/local/bin/glances
105108
RUN chmod a+x /usr/local/bin/glances
106109
ENV PATH="/venv/bin:$PATH"
107110

111+
# Copy binary and update PATH
112+
COPY docker-bin.sh /usr/local/bin/glances
113+
RUN chmod a+x /usr/local/bin/glances
114+
ENV PATH="/venv/bin:$PATH"
115+
108116
# EXPOSE PORT (XMLRPC / WebUI)
109117
EXPOSE 61209 61208
110118

docker-files/ubuntu.Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ COPY docker-bin.sh /usr/local/bin/glances
9292
RUN chmod a+x /usr/local/bin/glances
9393
ENV PATH="/venv/bin:$PATH"
9494

95+
# Copy binary and update PATH
96+
COPY docker-bin.sh /usr/local/bin/glances
97+
RUN chmod a+x /usr/local/bin/glances
98+
ENV PATH="/venv/bin:$PATH"
99+
95100
# EXPOSE PORT (XMLRPC / WebUI)
96101
EXPOSE 61209 61208
97102

0 commit comments

Comments
 (0)