diff --git a/debian/changelog b/debian/changelog
index ac173d5..c8cc2e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
afancontrol (3.1.0-1) unstable; urgency=medium
[ Juha Yrjölä ]
@@ -16,7 +14,6 @@ afancontrol (3.0.0-2) unstable; urgency=medium
-- Kostya Esmukov <kostya@esmukov.ru> Mon, 02 Aug 2021 19:19:34 +0000
->>>>>>> upstream/3.1.0
afancontrol (3.0.0-1) unstable; urgency=medium
* Drop support for prometheus-client < 0.1.0 (debian stretch)
diff --git a/debian/control b/debian/control
index 6d59fb9..fa52963 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Kostya Esmukov <kostya@esmukov.ru>
Build-Depends: debhelper-compat (= 13),
dh-python,
- debhelper (>= 9.20160709) | dh-systemd,
python3-all,
python3-click,
python3-prometheus-client (>= 0.1.0),
@@ -12,14 +11,6 @@ Build-Depends: debhelper-compat (= 13),
python3-requests,
python3-serial,
python3-setuptools
-<<<<<<< HEAD
-Build-Depends-Indep: python3-pytest,
- python3-requests,
- python3-click,
- python3-prometheus-client (>= 0.1.0),
- python3-serial
-=======
->>>>>>> upstream/3.1.0
Standards-Version: 3.9.8
Homepage: https://github.com/KostyaEsmukov/afancontrol
@@ -30,15 +21,10 @@ Depends: hddtemp,
python3-click,
python3-pkg-resources,
python3-prometheus-client (>= 0.1.0),
-<<<<<<< HEAD
- python3-serial
-Suggests: freeipmi-tools,
-=======
python3-serial,
${misc:Depends},
${python3:Depends}
Suggests: freeipmi-tools
->>>>>>> upstream/3.1.0
Description: Advanced Fan Control program (Python 3)
afancontrol is an Advanced Fan Control program, which controls PWM
fans according to the current temperatures of the system components.
diff --git a/debian/rules b/debian/rules
index c52aafe..3075489 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,4 @@ export PYBUILD_TEST_PYTEST=1
export PYBUILD_TEST_ARGS={dir}/tests/
%:
- dh $@ --with systemd,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
diff --git a/setup.cfg b/setup.cfg
index af24793..2917f03 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,15 +26,7 @@ per-file-ignores =
[isort]
multi_line_output = 3
-<<<<<<< HEAD
-; https://github.com/ambv/black#how-black-wraps-lines
-include_trailing_comma = True
-force_grid_wrap = 0
-combine_as_imports = True
-line_length = 88
-=======
profile = black
->>>>>>> upstream/3.1.0
[metadata]
author = Kostya Esmukov
@@ -48,13 +40,6 @@ classifier =
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
-<<<<<<< HEAD
- Programming Language :: Python :: 3.6
- Programming Language :: Python :: 3.7
- Programming Language :: Python :: 3.8
- Programming Language :: Python :: 3.9
-=======
->>>>>>> upstream/3.1.0
Topic :: System :: Hardware
Topic :: System :: Monitoring
Topic :: System :: Systems Administration
@@ -82,11 +67,7 @@ install_requires =
package_dir =
= src
packages = find:
-<<<<<<< HEAD
-python_requires = >=3.6
-=======
python_requires = >=3.7
->>>>>>> upstream/3.1.0
[options.entry_points]
console_scripts =
@@ -98,17 +79,6 @@ arduino =
metrics =
prometheus-client>=0.1.0
dev =
-<<<<<<< HEAD
- black==20.8b1
- coverage==5.3
- flake8==3.8.4
- isort==5.5.4
- mypy==0.782
- pytest==6.1.0
- requests
- sphinx==3.2.1
- wheel
-=======
black==22.10.0
coverage==6.5.0
flake8==5.0.4
@@ -119,7 +89,6 @@ dev =
vcrpy==4.2.1
requests
types-requests
->>>>>>> upstream/3.1.0
[options.packages.find]
where = src
diff --git a/src/afancontrol/__init__.py b/src/afancontrol/__init__.py
index c9b661d..f5f41e5 100644
--- a/src/afancontrol/__init__.py
+++ b/src/afancontrol/__init__.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
-__version__ = "3.0.0"
-=======
__version__ = "3.1.0"
->>>>>>> upstream/3.1.0
diff --git a/src/afancontrol/configparser.py b/src/afancontrol/configparser.py
index 7129188..e5e3d49 100644
--- a/src/afancontrol/configparser.py
+++ b/src/afancontrol/configparser.py
@@ -1,8 +1,5 @@
import configparser
-<<<<<<< HEAD
-=======
import glob
->>>>>>> upstream/3.1.0
from typing import Any, Generic, Iterator, Optional, Type, TypeVar, Union, overload
T = TypeVar("T", bound=str)
@@ -131,8 +128,6 @@ class ConfigParserSection(Generic[T]):
"[%s] %r option is expected to be set" % (self.__section.name, option)
)
return res
-<<<<<<< HEAD
-=======
def expand_glob(path: str):
@@ -142,4 +137,3 @@ def expand_glob(path: str):
if len(matches) == 1:
return matches[0]
raise ValueError("Expected glob to expand to a single path, got %r" % (matches,))
->>>>>>> upstream/3.1.0
diff --git a/src/afancontrol/pwmfan/linux.py b/src/afancontrol/pwmfan/linux.py
index 5fb38cd..c71849f 100644
--- a/src/afancontrol/pwmfan/linux.py
+++ b/src/afancontrol/pwmfan/linux.py
@@ -1,11 +1,7 @@
from pathlib import Path
from typing import NewType
-<<<<<<< HEAD
-from afancontrol.configparser import ConfigParserSection
-=======
from afancontrol.configparser import ConfigParserSection, expand_glob
->>>>>>> upstream/3.1.0
from afancontrol.pwmfan.base import (
BaseFanPWMRead,
BaseFanPWMWrite,
@@ -28,10 +24,6 @@ class LinuxFanSpeed(BaseFanSpeed):
def from_configparser(cls, section: ConfigParserSection) -> BaseFanSpeed:
return cls(FanInputDevice(section["fan_input"]))
- @classmethod
- def from_configparser(cls, section: ConfigParserSection) -> BaseFanSpeed:
- return cls(FanInputDevice(section["fan_input"]))
-
def get_speed(self) -> FanValue:
return FanValue(int(self._fan_input.read_text()))
@@ -49,10 +41,6 @@ class LinuxFanPWMRead(BaseFanPWMRead):
def from_configparser(cls, section: ConfigParserSection) -> BaseFanPWMRead:
return cls(PWMDevice(section["pwm"]))
- @classmethod
- def from_configparser(cls, section: ConfigParserSection) -> BaseFanPWMRead:
- return cls(PWMDevice(section["pwm"]))
-
def get(self) -> PWMValue:
return PWMValue(int(self._pwm.read_text()))
@@ -71,10 +59,6 @@ class LinuxFanPWMWrite(BaseFanPWMWrite):
def from_configparser(cls, section: ConfigParserSection) -> BaseFanPWMWrite:
return cls(PWMDevice(section["pwm"]))
- @classmethod
- def from_configparser(cls, section: ConfigParserSection) -> BaseFanPWMWrite:
- return cls(PWMDevice(section["pwm"]))
-
def _set_raw(self, pwm: PWMValue) -> None:
self._pwm.write_text(str(int(pwm)))
diff --git a/src/afancontrol/temp/file.py b/src/afancontrol/temp/file.py
index 3d44c52..acd7295 100644
--- a/src/afancontrol/temp/file.py
+++ b/src/afancontrol/temp/file.py
@@ -2,11 +2,7 @@ import re
from pathlib import Path
from typing import Optional, Tuple
-<<<<<<< HEAD
-from afancontrol.configparser import ConfigParserSection
-=======
from afancontrol.configparser import ConfigParserSection, expand_glob
->>>>>>> upstream/3.1.0
from afancontrol.temp.base import Temp, TempCelsius
diff --git a/tox.ini b/tox.ini
index 192c970..35690b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,5 @@
[tox]
-<<<<<<< HEAD
-envlist=py{36,37,38,39,310}{,-arduino,-metrics},lint,check-docs
-=======
envlist=py{37,38,39,310,311,312}{,-arduino,-metrics},lint,check-docs
->>>>>>> upstream/3.1.0
[testenv]
extras =