Use new click version

README.rst

@@ -118,7 +118,7 @@ Using pip requiring at least Python 3.6:
 
 .. code:: sh
 
-        pip3 install git+https://github.com/parttimenerd/temci.git
+        sudo pip3 install temci
 
 For more information see the Installation_ page.
 

default.nix

@@ -10,17 +10,13 @@ with pkgs.python37Packages;
 let
   python = import ./requirements.nix { inherit pkgs; };
   pypi = python.packages;
-  click_git = click.overrideAttrs (attrs: {
-    postPatch = "";
-    src = builtins.fetchGit { url = https://github.com/pallets/click.git; rev = "f537a208591088499b388b06b2aca4efd5445119"; };
-  });
 in buildPythonApplication rec {
   name = "temci-${version}";
   version = "local";
   inherit src;
   checkInputs = [ pytest pytestrunner ];
   propagatedBuildInputs = [
-    click_git
+    click
     humanfriendly
     fn
     pytimeparse

doc/changelog.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.8.3
+-----
+- add `--watch`: prints console report continuously
+- improve progressbar
+- `perf` runner works on NixOS
+- use new click version (temci is installable via pip click again)
+
 0.8.2
 -----
 - improve HTML2 reporter

doc/installation.rst

@@ -53,11 +53,13 @@ The Linux packages can be installed by calling the ``install_packages.sh`` scrip
 After installing these packages, temci can be installed by calling:
 
 .. code:: sh
-
+        # From GitHub
         pip3 install git+https://github.com/parttimenerd/temci.git
 
-A package called temci exists on pypi, but temci depends on an unpublished version of the ``click`` library that is only available on
-github. This should change in the near future when the version 8.0 of ``click`` is published.
+        # From PyPi
+        pip3 install temci
+
+To use temci plugins that need super user privileges, e.g. cpu sets, install temci globally.
 
 If there a problems with ``click`` (if you get an exception like ``ImportError: cannot import name 'ParameterSource'``), try installing
 it directly from github:

setup.py

@@ -1,5 +1,4 @@
 from os import path
-import os
 
 from setuptools import setup, find_packages
 
@@ -21,7 +20,7 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        'click @ https://github.com/pallets/click/archive/f537a208591088499b388b06b2aca4efd5445119.zip',
+        'click',
         'humanfriendly', 'pytimeparse',
         'fn',
         'cpuset-py3',

temci/run/cpuset.py

@@ -316,7 +316,7 @@ def _cset(self, argument: str):
         :raises EnvironmentError: if something goes wrong
         """
         # cmd = ["/bin/sh", "-c", "sudo cset {}".format(argument)]
-        cmd = ["/bin/sh", "-c", "python3 -c 'import cpuset.main; print(cpuset.main.main())' " + argument]
+        cmd = ["/bin/sh", "-c", "python3 -ct 'import cpuset.main; print(cpuset.main.main())' " + argument]
         proc = subprocess.Popen(cmd,
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE,

temci/run/run_processor.py

@@ -221,7 +221,7 @@ def bench(run: int) -> bool:
                 import click
                 with click.progressbar(range(0, self.max_runs + self.discarded_runs),
                                        label=label_format.format(start_label),
-                                       file=None if self.pool.run_driver.runs_benchmarks else "-") as runs:
+                                       file=None if self.pool.run_driver.runs_benchmarks else open(os.devnull, 'w')) as runs:
                     discard_label = "Discarded benchmark {{}} out of {}".format(self.discarded_runs)
                     if self.fixed_runs:
                         label = "Benchmark {{}} out of {}".format(self.max_runs)

temci/utils/click_helper.py

@@ -7,7 +7,8 @@
 import warnings
 
 import click
-from click import Context, ParameterSource
+from click import Context
+from click.core import ParameterSource
 
 from temci.utils.typecheck import *
 from temci.utils.settings import Settings, SettingsError