Merge pull request #292021 from fabaff/weconnect-bump

python311Packages.weconnect: 0.60.0 -> 0.60.1, python311Packages.weconnect-mqtt: 0.48.3 -> 0.48.4
This commit is contained in:
Fabian Affolter 2024-02-28 09:33:56 +01:00 committed by GitHub
commit 410c60e182
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 26 deletions

View file

@ -6,12 +6,13 @@
, paho-mqtt
, python-dateutil
, weconnect
, setuptools
}:
buildPythonPackage rec {
pname = "weconnect-mqtt";
version = "0.48.4";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,15 +24,19 @@ buildPythonPackage rec {
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "weconnect[Images]~=" "weconnect>="
substituteInPlace weconnect_mqtt/__version.py \
--replace "develop" "${version}"
--replace-fail "0.0.0dev" "${version}"
substituteInPlace requirements.txt \
--replace-fail "weconnect[Images]~=" "weconnect>="
substituteInPlace pytest.ini \
--replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \
--replace "pytest-cov" ""
--replace-fail "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \
--replace-fail "pytest-cov" ""
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
paho-mqtt
python-dateutil

View file

@ -2,18 +2,18 @@
, ascii-magic
, buildPythonPackage
, fetchFromGitHub
, oauthlib
, pillow
, pytest-httpserver
, pytestCheckHook
, pythonOlder
, requests
, oauthlib
, setuptools
}:
buildPythonPackage rec {
pname = "weconnect";
version = "0.59.5";
format = "setuptools";
version = "0.60.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -21,9 +21,24 @@ buildPythonPackage rec {
owner = "tillsteinbach";
repo = "WeConnect-python";
rev = "refs/tags/v${version}";
hash = "sha256-ujIA98QD8ds2/iLLeJqn88nY9tZuuOSnOwGvRznA8PQ=";
hash = "sha256-hvV4pbCyzAbi3bKXClzpiyhp+4qnuIj5pViUe7pEq64=";
};
postPatch = ''
substituteInPlace weconnect/__version.py \
--replace-fail "0.0.0dev" "${version}"
substituteInPlace setup.py \
--replace-fail "setup_requires=SETUP_REQUIRED" "setup_requires=[]" \
--replace-fail "tests_require=TEST_REQUIRED" "tests_require=[]"
substituteInPlace pytest.ini \
--replace-fail "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
--replace-fail "required_plugins = pytest-cov" ""
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
oauthlib
requests
@ -37,24 +52,9 @@ buildPythonPackage rec {
};
nativeCheckInputs = [
pytest-httpserver
pytestCheckHook
];
postPatch = ''
substituteInPlace weconnect/__version.py \
--replace "develop" "${version}"
substituteInPlace setup.py \
--replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
--replace "tests_require=TEST_REQUIRED," "tests_require=[],"
substituteInPlace image_extra_requirements.txt \
--replace "pillow~=" "pillow>=" \
--replace "ascii_magic~=" "ascii_magic>="
substituteInPlace pytest.ini \
--replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
--replace "required_plugins = pytest-httpserver pytest-cov" ""
'';
pythonImportsCheck = [
"weconnect"
];