modpoll 0.7.2__tar.gz → 0.8.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. {modpoll-0.7.2 → modpoll-0.8.0}/LICENSE +1 -1
  2. {modpoll-0.7.2 → modpoll-0.8.0}/PKG-INFO +17 -16
  3. {modpoll-0.7.2 → modpoll-0.8.0}/README.md +11 -11
  4. {modpoll-0.7.2 → modpoll-0.8.0}/pyproject.toml +28 -19
  5. {modpoll-0.7.2 → modpoll-0.8.0}/modpoll/__init__.py +0 -0
  6. {modpoll-0.7.2 → modpoll-0.8.0}/modpoll/__main__.py +0 -0
  7. {modpoll-0.7.2 → modpoll-0.8.0}/modpoll/arg_parser.py +0 -0
  8. {modpoll-0.7.2 → modpoll-0.8.0}/modpoll/main.py +0 -0
  9. {modpoll-0.7.2 → modpoll-0.8.0}/modpoll/modbus_task.py +0 -0
  10. {modpoll-0.7.2 → modpoll-0.8.0}/modpoll/mqtt_task.py +0 -0
{modpoll-0.7.2 → modpoll-0.8.0}/LICENSE RENAMED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright (c) 2021-2024 Ying Shaodong
3
+ Copyright (c) 2021-2024, Ying Shaodong
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
{modpoll-0.7.2 → modpoll-0.8.0}/PKG-INFO RENAMED
@@ -1,34 +1,35 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: modpoll
3
- Version: 0.7.2
3
+ Version: 0.8.0
4
4
  Summary: A New Command-line Tool for Modbus and MQTT
5
- Home-page: https://helloysd.gitlab.io/modpoll
6
- License: MIT
5
+ Home-page: https://github.com/gavinying/modpoll
7
6
  Author: Ying Shaodong
8
7
  Author-email: helloysd@gmail.com
9
8
  Requires-Python: >=3.8.2,<4.0
10
- Classifier: License :: OSI Approved :: MIT License
11
9
  Classifier: Programming Language :: Python :: 3
12
10
  Classifier: Programming Language :: Python :: 3.9
13
11
  Classifier: Programming Language :: Python :: 3.10
14
12
  Classifier: Programming Language :: Python :: 3.11
13
+ Classifier: Programming Language :: Python :: 3.12
15
14
  Provides-Extra: serial
15
+ Requires-Dist: importlib-metadata (>=8.0.0,<9.0.0)
16
16
  Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
17
17
  Requires-Dist: prettytable (>=3.6.0,<4.0.0)
18
- Requires-Dist: pymodbus (>=3.5.4,<4.0.0)
18
+ Requires-Dist: pymodbus (>=3.5.4,<3.6.0)
19
19
  Requires-Dist: pyserial (>=3.5,<4.0) ; extra == "serial"
20
20
  Requires-Dist: requests (>=2.28.1,<3.0.0)
21
+ Project-URL: Documentation, https://gavinying.github.io/modpoll
21
22
  Project-URL: Repository, https://github.com/gavinying/modpoll
22
23
  Description-Content-Type: text/markdown
23
24
 
24
- # modpoll - A New Command-line Tool for Modbus and MQTT
25
+ # Modpoll - A New Command-line Tool for Modbus and MQTT
25
26
 
26
- [![pipeline status](https://gitlab.com/helloysd/modpoll/badges/master/pipeline.svg)](https://gitlab.com/helloysd/modpoll/-/commits/master)
27
- [![License](https://img.shields.io/pypi/l/modpoll)](https://gitlab.com/helloysd/modpoll/-/blob/master/LICENSE)
27
+ [![Release](https://img.shields.io/github/v/release/gavinying/modpoll)](https://img.shields.io/github/v/release/gavinying/modpoll)
28
+ [![Build status](https://img.shields.io/github/actions/workflow/status/gavinying/modpoll/main.yml?branch=main)](https://github.com/gavinying/modpoll/actions/workflows/main.yml?query=branch%3Amain)
29
+ [![License](https://img.shields.io/github/license/gavinying/modpoll)](https://img.shields.io/github/license/gavinying/modpoll)
28
30
  [![Downloads](https://static.pepy.tech/badge/modpoll/week)](https://pepy.tech/project/modpoll)
29
31
 
30
- > Learn more about *modpoll* usage at [documentation](https://helloysd.gitlab.io/modpoll) site.
31
-
32
+ > Learn more about *modpoll* usage at [documentation](https://gavinying.github.io/modpoll) site.
32
33
 
33
34
  ## Motivation
34
35
 
@@ -62,17 +63,17 @@ In fact, *modpoll* helps to bridge between the traditional field-bus world and t
62
63
 
63
64
  ## Installation
64
65
 
65
- This program tested on python 3.8+, the package is available in the Python Package Index, users can easily install it using `pip` or `pipx`.
66
+ This program tested on Python 3.8+, the package is available in the [Python Package Index](https://pypi.org/), users can easily install it using `pip` or `pipx`.
66
67
 
67
68
  ### Using PIP
68
69
 
69
- Python3 is supported by most popular platforms, e.g. Linux/macOS/Windows, on which you can install *modpoll* using `pip` tool,
70
+ Install *modpoll* using the following command,
70
71
 
71
72
  ```bash
72
73
  pip install modpoll
73
74
  ```
74
75
 
75
- Optionally, pyserial library can be installed for Modbus-RTU communication,
76
+ Optionally, [pyserial](https://pyserial.readthedocs.io/) library can be installed for Modbus-RTU communication,
76
77
 
77
78
  ```bash
78
79
  pip install 'modpoll[serial]'
@@ -175,7 +176,7 @@ You can also take a look at [contrib](https://github.com/gavinying/modpoll/tree/
175
176
 
176
177
  The configuration can be either a local file or a remote public URL resource.
177
178
 
178
- > *Refer to the [documentation](https://helloysd.gitlab.io/modpoll/configure.html) site for more details.*
179
+ > *Refer to the [documentation](https://gavinying.github.io/modpoll/configure.html) site for more details.*
179
180
 
180
181
  ### Poll local device (modsim)
181
182
 
@@ -326,7 +327,7 @@ for example, if the child folder `examples` contains the config file `modsim.csv
326
327
  ```
327
328
 
328
329
 
329
- > *Refer to the [documentation](https://helloysd.gitlab.io/modpoll) site for more details about the configuration and examples.*
330
+ > *Refer to the [documentation](https://gavinying.github.io/modpoll) site for more details about the configuration and examples.*
330
331
 
331
332
 
332
333
  ## Credits
@@ -340,5 +341,5 @@ Thanks to Max Brueggemann and Oliver Wagner for their great work.
340
341
 
341
342
  ## License
342
343
 
343
- MIT © [helloysd](helloysd@gmail.com)
344
+ MIT © 2021-2024, Ying Shaodong
344
345
 
{modpoll-0.7.2 → modpoll-0.8.0}/README.md RENAMED
@@ -1,11 +1,11 @@
1
- # modpoll - A New Command-line Tool for Modbus and MQTT
1
+ # Modpoll - A New Command-line Tool for Modbus and MQTT
2
2
 
3
- [![pipeline status](https://gitlab.com/helloysd/modpoll/badges/master/pipeline.svg)](https://gitlab.com/helloysd/modpoll/-/commits/master)
4
- [![License](https://img.shields.io/pypi/l/modpoll)](https://gitlab.com/helloysd/modpoll/-/blob/master/LICENSE)
3
+ [![Release](https://img.shields.io/github/v/release/gavinying/modpoll)](https://img.shields.io/github/v/release/gavinying/modpoll)
4
+ [![Build status](https://img.shields.io/github/actions/workflow/status/gavinying/modpoll/main.yml?branch=main)](https://github.com/gavinying/modpoll/actions/workflows/main.yml?query=branch%3Amain)
5
+ [![License](https://img.shields.io/github/license/gavinying/modpoll)](https://img.shields.io/github/license/gavinying/modpoll)
5
6
  [![Downloads](https://static.pepy.tech/badge/modpoll/week)](https://pepy.tech/project/modpoll)
6
7
 
7
- > Learn more about *modpoll* usage at [documentation](https://helloysd.gitlab.io/modpoll) site.
8
-
8
+ > Learn more about *modpoll* usage at [documentation](https://gavinying.github.io/modpoll) site.
9
9
 
10
10
  ## Motivation
11
11
 
@@ -39,17 +39,17 @@ In fact, *modpoll* helps to bridge between the traditional field-bus world and t
39
39
 
40
40
  ## Installation
41
41
 
42
- This program tested on python 3.8+, the package is available in the Python Package Index, users can easily install it using `pip` or `pipx`.
42
+ This program tested on Python 3.8+, the package is available in the [Python Package Index](https://pypi.org/), users can easily install it using `pip` or `pipx`.
43
43
 
44
44
  ### Using PIP
45
45
 
46
- Python3 is supported by most popular platforms, e.g. Linux/macOS/Windows, on which you can install *modpoll* using `pip` tool,
46
+ Install *modpoll* using the following command,
47
47
 
48
48
  ```bash
49
49
  pip install modpoll
50
50
  ```
51
51
 
52
- Optionally, pyserial library can be installed for Modbus-RTU communication,
52
+ Optionally, [pyserial](https://pyserial.readthedocs.io/) library can be installed for Modbus-RTU communication,
53
53
 
54
54
  ```bash
55
55
  pip install 'modpoll[serial]'
@@ -152,7 +152,7 @@ You can also take a look at [contrib](https://github.com/gavinying/modpoll/tree/
152
152
 
153
153
  The configuration can be either a local file or a remote public URL resource.
154
154
 
155
- > *Refer to the [documentation](https://helloysd.gitlab.io/modpoll/configure.html) site for more details.*
155
+ > *Refer to the [documentation](https://gavinying.github.io/modpoll/configure.html) site for more details.*
156
156
 
157
157
  ### Poll local device (modsim)
158
158
 
@@ -303,7 +303,7 @@ for example, if the child folder `examples` contains the config file `modsim.csv
303
303
  ```
304
304
 
305
305
 
306
- > *Refer to the [documentation](https://helloysd.gitlab.io/modpoll) site for more details about the configuration and examples.*
306
+ > *Refer to the [documentation](https://gavinying.github.io/modpoll) site for more details about the configuration and examples.*
307
307
 
308
308
 
309
309
  ## Credits
@@ -317,4 +317,4 @@ Thanks to Max Brueggemann and Oliver Wagner for their great work.
317
317
 
318
318
  ## License
319
319
 
320
- MIT © [helloysd](helloysd@gmail.com)
320
+ MIT © 2021-2024, Ying Shaodong
{modpoll-0.7.2 → modpoll-0.8.0}/pyproject.toml RENAMED
@@ -1,43 +1,52 @@
1
1
  [tool.poetry]
2
2
  name = "modpoll"
3
- version = "0.7.2"
3
+ version = "v0.8.0"
4
4
  description = "A New Command-line Tool for Modbus and MQTT"
5
5
  authors = ["Ying Shaodong <helloysd@gmail.com>"]
6
- readme = "README.md"
7
- homepage = "https://helloysd.gitlab.io/modpoll"
8
6
  repository = "https://github.com/gavinying/modpoll"
9
- license = "MIT"
10
- include = [
11
- "LICENSE",
7
+ documentation = "https://gavinying.github.io/modpoll"
8
+ readme = "README.md"
9
+ packages = [
10
+ {include = "modpoll"}
12
11
  ]
13
12
 
14
13
  [tool.poetry.dependencies]
15
14
  python = ">=3.8.2,<4.0"
16
- pymodbus = "^3.5.4"
15
+ importlib-metadata = "^8.0.0"
16
+ pymodbus = "~3.5.4"
17
17
  paho-mqtt = "^1.6.1"
18
18
  prettytable = "^3.6.0"
19
19
  requests = "^2.28.1"
20
20
  pyserial = { version = "^3.5", optional = true }
21
21
 
22
+ [tool.poetry.extras]
23
+ serial = ["pyserial"]
24
+
22
25
  [tool.poetry.group.dev.dependencies]
23
- pytest = "^7.2.0"
24
- pytest-cov = "^4.0.0"
25
- black = "^23.7.0"
26
- isort = "^5.12.0"
27
- flake8 = "^6.0.0"
28
- bandit = "^1.7.4"
29
- safety = "^2.3.0"
30
- sphinx = "^4.2.0"
31
- sphinx-argparse = "^0.3.1"
32
- sphinx-rtd-theme = "^1.0.0"
33
26
  pre-commit = "^3.5.0"
27
+ pytest = "^8.2.2"
28
+ deptry = "^0.16.1"
29
+ tox = "^4.16.0"
34
30
 
35
- [tool.poetry.extras]
36
- serial = ["pyserial"]
31
+ [tool.poetry.group.docs.dependencies]
32
+ sphinx = "~4.2.0"
33
+ sphinx-argparse = "^0.3.1"
34
+ sphinx-rtd-theme = "^1.0.0"
35
+ sphinx-autobuild = "2021.3.14"
36
+ pandoc = "^2.3"
37
37
 
38
38
  [build-system]
39
39
  requires = ["poetry-core>=1.0.0"]
40
40
  build-backend = "poetry.core.masonry.api"
41
41
 
42
+ [tool.deptry]
43
+ package_module_name_map = { pyserial = "serial" }
44
+
45
+ [tool.deptry.per_rule_ignores]
46
+ DEP002 = ["pyserial"]
47
+
48
+ [tool.pytest.ini_options]
49
+ testpaths = ["tests"]
50
+
42
51
  [tool.poetry.scripts]
43
52
  modpoll = "modpoll.main:app"
{modpoll-0.7.2 → modpoll-0.8.0}/modpoll/__init__.py RENAMED
File without changes
{modpoll-0.7.2 → modpoll-0.8.0}/modpoll/__main__.py RENAMED
File without changes
{modpoll-0.7.2 → modpoll-0.8.0}/modpoll/arg_parser.py RENAMED
File without changes
{modpoll-0.7.2 → modpoll-0.8.0}/modpoll/main.py RENAMED
File without changes
{modpoll-0.7.2 → modpoll-0.8.0}/modpoll/modbus_task.py RENAMED
File without changes
{modpoll-0.7.2 → modpoll-0.8.0}/modpoll/mqtt_task.py RENAMED
File without changes