summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2021-11-22 11:41:22 +0100
committernicolargo <nicolas@nicolargo.com>2021-11-22 11:41:22 +0100
commitd3ac8a56475744de5282cd9cce8f8fdd8ee1c034 (patch)
tree28e7bd73264fe29720264d532b205232dd4f3504
parent7b9fcc53d65549bf0809ea5cf736ed09b21825e9 (diff)
parent42f184d23ad332f634aac5f868b15f382990ee6e (diff)
Merge branch 'develop' of github.com:nicolargo/glances into develop
-rw-r--r--.github/workflows/test.yml2
-rw-r--r--README.rst6
-rwxr-xr-xsetup.py1
3 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a0cd40dc..42c2a45f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
+ python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
steps:
diff --git a/README.rst b/README.rst
index 192c5b91..e121d807 100644
--- a/README.rst
+++ b/README.rst
@@ -17,9 +17,9 @@ Glances - An eye on your system
:target: https://pepy.tech/project/glances
:alt: Pypi downloads
-.. image:: https://img.shields.io/travis/nicolargo/glances/master.svg?maxAge=3600&label=Linux%20/%20BSD%20/%20macOS
- :target: https://travis-ci.org/nicolargo/glances
- :alt: Linux tests (Travis)
+.. image:: https://github.com/nicolargo/glances/actions/workflows/test.yml/badge.svg
+ :target: https://github.com/nicolargo/glances/actions
+ :alt: Linux tests (GitHub Actions)
.. image:: https://img.shields.io/appveyor/ci/nicolargo/glances/master.svg?maxAge=3600&label=Windows
:target: https://ci.appveyor.com/project/nicolargo/glances
diff --git a/setup.py b/setup.py
index e1a101f6..653b63db 100755
--- a/setup.py
+++ b/setup.py
@@ -141,6 +141,7 @@ setup(
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
'Topic :: System :: Monitoring'
]
)