update compat

.travis.yml

@@ -0,0 +1,37 @@
+language: python
+dist: xenial
+
+python:
+  - "3.6"
+  - "3.7"
+  - "3.8"
+  # TODO add 3.9
+  - "3.9-dev"
+
+install: pip install tox-travis tox tox-venv
+
+# Used by the `test` stage.
+script: tox
+
+stages:
+  - test
+  - lint
+
+jobs:
+  allow_failures:
+    - python: "3.9-dev"
+
+  include:
+
+    # The `test` stage using the `python` matrix defined above
+    # is included implicitly.
+
+    - stage: lint
+      name: "Code Linting"
+      python: "3.7"
+      script: TOXENV=lint tox
+
+    - stage: check-docs
+      name: "Docs check"
+      python: "3.7"
+      script: TOXENV=check-docs tox

debian/changelog

@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 afancontrol (3.1.0-1) unstable; urgency=medium
 
   [ Juha Yrjölä ]
@@ -14,6 +16,7 @@ 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)

debian/control

@@ -4,6 +4,7 @@ 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),
@@ -11,6 +12,14 @@ 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
 
@@ -21,10 +30,15 @@ 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.

debian/rules

@@ -9,4 +9,4 @@ export PYBUILD_TEST_PYTEST=1
 export PYBUILD_TEST_ARGS={dir}/tests/
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with systemd,python3 --buildsystem=pybuild

setup.cfg

@@ -26,7 +26,15 @@ 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
@@ -40,6 +48,13 @@ 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
@@ -67,7 +82,11 @@ 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 =
@@ -79,6 +98,17 @@ 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
@@ -89,6 +119,7 @@ dev =
     vcrpy==4.2.1
     requests
     types-requests
+>>>>>>> upstream/3.1.0
 
 [options.packages.find]
 where = src

src/afancontrol/__init__.py

@@ -1 +1,5 @@
+<<<<<<< HEAD
+__version__ = "3.0.0"
+=======
 __version__ = "3.1.0"
+>>>>>>> upstream/3.1.0

src/afancontrol/configparser.py

@@ -1,5 +1,8 @@
 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)
@@ -128,6 +131,8 @@ class ConfigParserSection(Generic[T]):
                 "[%s] %r option is expected to be set" % (self.__section.name, option)
             )
         return res
+<<<<<<< HEAD
+=======
 
 
 def expand_glob(path: str):
@@ -137,3 +142,4 @@ 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

src/afancontrol/pwmfan/linux.py

@@ -1,7 +1,11 @@
 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,
@@ -24,6 +28,10 @@ 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()))
 
@@ -41,6 +49,10 @@ 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()))
 
@@ -59,6 +71,10 @@ 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)))
 

src/afancontrol/temp/file.py

@@ -2,7 +2,11 @@ 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
 
 

tox.ini

@@ -1,5 +1,9 @@
 [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 =