requirements update

5 files changed, 22 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index 64c7f1c..5759e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 /cache
 /deps
 /node_modules
+/src_py/opcut/bin
 /src_py/opcut/json_schema_repo.json
 /src_py/opcut/ui
-/src_py/opcut/*-opcut-calculate*
 __pycache__
diff --git a/README.rst b/README.rst
index 49f1e25..a7aa0ba 100644
--- a/README.rst
+++ b/README.rst
@@ -18,12 +18,10 @@ Runtime requirements
 
 * python >=3.8
 
+.. note::
 
-Development requirements
-------------------------
-
-* nodejs >=7
-* yarn
+    on Ubuntu, if pycairo is not available, additional
+    ``apt install gcc pkg-config libcairo2-dev python3-dev`` is required
 
 
 Install
@@ -35,11 +33,6 @@ Install
 
 .. note::
 
-    on Ubuntu, if pycairo is not available, additional
-    ``apt install gcc pkg-config libcairo2-dev python3-dev`` is required
-
-.. note::
-
     Windows distribution, with embedded python, is available at
     `https://github.com/bozokopic/opcut/releases`
 
@@ -61,6 +54,13 @@ Additional command line arguments::
     $ opcut --help
 
 
+Development requirements
+------------------------
+
+* nodejs >=7
+* yarn
+
+
 Build
 -----
 
diff --git a/requirements.pip.dev.txt b/requirements.pip.dev.txt
index 52b0f43..4a24a30 100644
--- a/requirements.pip.dev.txt
+++ b/requirements.pip.dev.txt
@@ -4,7 +4,7 @@ build ~= 0.7.0
 doit ~= 0.33.1
 flake8 ~= 3.9.2
 furo >= 2021.10.9
-hat-doit ~= 0.8.0
+hat-doit ~= 0.8.1
 peru >= 1.3.0
 pytest ~= 6.2.5
 pytest-asyncio ~= 0.15.1
diff --git a/src_doit/__init__.py b/src_doit/__init__.py
index 8c2498d..8402cfc 100644
--- a/src_doit/__init__.py
+++ b/src_doit/__init__.py
@@ -44,11 +44,10 @@ json_schema_repo_path = src_py_dir / 'opcut/json_schema_repo.json'
 
 def task_clean_all():
     """Clean all"""
-    return {'actions': [(common.rm_rf, [
-        build_dir,
-        ui_dir,
-        json_schema_repo_path,
-        *(src_py_dir / 'opcut').glob('*-opcut-calculate*')])]}
+    return {'actions': [(common.rm_rf, [build_dir,
+                                        ui_dir,
+                                        json_schema_repo_path,
+                                        src_py_dir / 'opcut/bin'])]}
 
 
 def task_wheel():
diff --git a/src_doit/c.py b/src_doit/c.py
index 7c7162a..df767ac 100644
--- a/src_doit/c.py
+++ b/src_doit/c.py
@@ -1,8 +1,7 @@
 from pathlib import Path
 
-from hat.doit.c import (local_platform,
-                        get_exe_suffix,
-                        Platform,
+from hat.doit import common
+from hat.doit.c import (get_exe_suffix,
                         CBuild)
 
 
@@ -18,9 +17,9 @@ src_py_dir = Path('src_py')
 
 build_c_dir = build_dir / 'c'
 
-platforms = [local_platform]
-if local_platform == Platform.LINUX:
-    platforms.append(Platform.WINDOWS)
+platforms = [common.local_platform]
+if common.local_platform == common.Platform.LINUX:
+    platforms.append(common.Platform.WINDOWS)
 
 builds = [CBuild(src_paths=[*src_c_dir.rglob('*.c'),
                             deps_dir / 'argparse/argparse.c'],
@@ -32,7 +31,7 @@ builds = [CBuild(src_paths=[*src_c_dir.rglob('*.c'),
                  task_dep=['deps'])
           for platform in platforms]
 
-exe_paths = [src_py_dir / (f'opcut/{platform.name.lower()}-'
+exe_paths = [src_py_dir / (f'opcut/bin/{platform.name.lower()}-'
                            f'opcut-calculate'
                            f'{get_exe_suffix(platform)}')
              for platform in platforms]