cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #303579 from fabaff/pybotvac-bump

Browse source 
python312Packages.pybotvac: 0.0.24 -> 0.0.25
This commit is contained in:
Fabian Affolter 2024-04-13 10:08:22 +02:00 committed by GitHub
commit ba8e828487
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/development/python-modules/pybotvac/default.nix
View file

@ -1,29 +1,35 @@
{ lib {
, buildPythonPackage lib,
, fetchPypi buildPythonPackage,
, pythonOlder fetchPypi,
, requests pythonOlder,
, requests-oauthlib requests,
, voluptuous requests-oauthlib,
voluptuous,
setuptools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pybotvac"; pname = "pybotvac";
version = "0.0.24"; version = "0.0.25";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; hash = "sha256-EvGBStEYgqFO9GMtxs1qtDixb4y2Ptom8xncRUv4ur4=";
}; };
patches = [ postPatch = ''
./urllib3-2.0-compat.patch substituteInPlace pybotvac/robot.py \
]; --replace-fail "import urllib3" "" \
--replace-fail "urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)" "# urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)"
'';
propagatedBuildInputs = [ build-system = [ setuptools ];
dependencies = [
requests requests
requests-oauthlib requests-oauthlib
voluptuous voluptuous
@ -32,9 +38,7 @@ buildPythonPackage rec {
# Module no tests # Module no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [ "pybotvac" ];
"pybotvac"
];
meta = with lib; { meta = with lib; {
description = "Python module for interacting with Neato Botvac Connected vacuum robots"; description = "Python module for interacting with Neato Botvac Connected vacuum robots";

21
pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch
View file

@ -1,21 +0,0 @@
diff --git a/pybotvac/robot.py b/pybotvac/robot.py
index f87546f..e9a61de 100644
--- a/pybotvac/robot.py
+++ b/pybotvac/robot.py
@@ -6,7 +6,6 @@ from datetime import datetime, timezone
from email.utils import format_datetime
import requests
-import urllib3
from voluptuous import (
ALLOW_EXTRA,
All,
@@ -21,8 +20,6 @@ from voluptuous import (
from .exceptions import NeatoRobotException, NeatoUnsupportedDevice
from .neato import Neato # For default Vendor argument
-# Disable warning due to SubjectAltNameWarning in certificate
-urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)
_LOGGER = logging.getLogger(__name__)