Skip to content

Commit

Permalink
Merge branch '0.4.X.X' of https://github.com/albertogeniola/MerossIot
Browse files Browse the repository at this point in the history
…into development-0.4.X.X
  • Loading branch information
albertogeniola committed Mar 26, 2024
2 parents d3d56b2 + bafdc87 commit c5762c6
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.6.0
0.4.6.2
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Due to the popularity of the library, I've decided to list it publicly on the Pi
So, the installation is as simple as typing the following command:

```bash
pip install meross_iot==0.4.6.0
pip install meross_iot==0.4.6.2
```

## Usage & Full Documentation
Expand Down Expand Up @@ -191,6 +191,11 @@ Anyway, feel free to contribute via donations!
</p>

## Changelog
#### 0.4.6.2
- Fix dependency specification for paho-mqtt and other libraries

<details>
<summary>Older</summary>
#### 0.4.6.0
- NOTE: this API version breaks backward compatibility with LOGIN method. When upgrading to this version,
make sure to pass the new api_base_url value correctly as described in the documentation.
Expand All @@ -202,8 +207,6 @@ make sure to pass the new api_base_url value correctly as described in the docum
- Handling MFA code errors
- Fix sniffer script and added MFA disable disclaimer

<details>
<summary>Older</summary>
#### 0.4.5.9
- Improve meross_sniffer utility: add support to collect messages spoofing the hardware device on meross cloud.
- Allow string namespace value for execute_command within manager.
Expand Down
8 changes: 5 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
sphinx_rtd_theme
paho-mqtt>=1.5.0
requests>=2.19.1
paho-mqtt>=1.5.0,<2.0.0
requests>=2.19.1,<3.0.0
retrying>=1.3.3
coverage==7.0.3
aiohttp[speedups]>=3.6.1
pytest-aiohttp
proxy.py
pysocks
pysocks
sphinx>=6.1.3
docutils>=0.19
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
paho-mqtt>=1.5.0, < 2.0.0
requests>=2.19.1, < 3.0.0
aiohttp[speedups]>=3.7.4.post0, < 4.0.0
paho-mqtt>=1.5.0,<2.0.0
requests>=2.19.1,<3.0.0
aiohttp[speedups]>=3.7.4.post0,<4.0.0
pytest==6.2.5
pytest-html==3.1.1
pytest-cov==2.12.1
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
paho-mqtt>=1.5.0, < 2.0.0
requests>=2.19.1, < 3.0.0
aiohttp[speedups]>=3.7.4.post0, < 4.0.0
paho-mqtt>=1.5.0,<2.0.0
requests>=2.19.1,<3.0.0
aiohttp[speedups]>=3.7.4.post0,<4.0.0
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
'Tracker': 'https://github.com/albertogeniola/MerossIot/issues',
},
install_requires=[
'paho-mqtt>=1.5.0',
'requests>=2.19.1',
'aiohttp[speedups]>=3.7.4.post0'
'paho-mqtt>=1.5.0,<2.0.0',
'requests>=2.19.1,<3.0.0',
'aiohttp[speedups]>=3.7.4.post0,<4.0.0'
],
python_requires='>=3.7',
test_suite='tests',
Expand Down

0 comments on commit c5762c6

Please sign in to comment.