Merge pull request #40 from alphatwirl/rename

Rename `progressreport` to `progress_report`
alphatwirl · May 20, 2024 · 3c08f57 · 3c08f57
2 parents e3e3ed9 + 4964129
commit 3c08f57
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 10 deletions.
diff --git a/atpbar/funcs.py b/atpbar/funcs.py
@@ -4,7 +4,7 @@
 from collections.abc import Iterator
 
 from .machine import StateMachine
-from .progressreport import ProgressReporter
+from .progress_report import ProgressReporter
 
 _machine = StateMachine()
 

diff --git a/atpbar/machine.py b/atpbar/machine.py
@@ -3,7 +3,7 @@
 from threading import Lock, current_thread, main_thread
 
 from .presentation import create_presentation
-from .progressreport import ProgressReporter, ProgressReportPickup, Report
+from .progress_report import ProgressReporter, ProgressReportPickup, Report
 from .stream import StreamQueue, StreamRedirection, register_stream_queue
 
 

diff --git a/atpbar/main.py b/atpbar/main.py
@@ -5,7 +5,7 @@
 from typing import Generic, Optional, TypeVar
 
 from .funcs import fetch_reporter
-from .progressreport import Report
+from .progress_report import Report
 
 T = TypeVar('T')
 

diff --git a/atpbar/presentation/base.py b/atpbar/presentation/base.py
@@ -5,7 +5,7 @@
 from typing import TextIO
 from uuid import UUID
 
-from atpbar.progressreport import Report
+from atpbar.progress_report import Report
 
 
 class Presentation(ABC):

diff --git a/atpbar/progressreport/__init__.py → atpbar/progress_report/__init__.py b/atpbar/progressreport/__init__.py → atpbar/progress_report/__init__.py
diff --git a/atpbar/progressreport/complement.py → atpbar/progress_report/complement.py b/atpbar/progressreport/complement.py → atpbar/progress_report/complement.py
diff --git a/atpbar/progressreport/pickup.py → atpbar/progress_report/pickup.py b/atpbar/progressreport/pickup.py → atpbar/progress_report/pickup.py
diff --git a/atpbar/progressreport/report.py → atpbar/progress_report/report.py b/atpbar/progressreport/report.py → atpbar/progress_report/report.py
diff --git a/atpbar/progressreport/reporter.py → atpbar/progress_report/reporter.py b/atpbar/progressreport/reporter.py → atpbar/progress_report/reporter.py
diff --git a/tests/progressreport/__init__.py → tests/progress_report/__init__.py b/tests/progressreport/__init__.py → tests/progress_report/__init__.py
diff --git a/tests/progressreport/test_pickup.py → tests/progress_report/test_pickup.py b/tests/progressreport/test_pickup.py → tests/progress_report/test_pickup.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from atpbar.progressreport.pickup import ProgressReportPickup
+from atpbar.progress_report.pickup import ProgressReportPickup
 
 
 class TestStart:
@@ -130,7 +130,7 @@ def mock_short_sleep(self, pickup, monkeypatch):
     def mock_time(self, monkeypatch):
         ret = mock.Mock()
         ret.time.return_value = 1000.0
-        from atpbar.progressreport import pickup as m
+        from atpbar.progress_report import pickup as m
 
         monkeypatch.setattr(m, "time", ret)
         return ret

diff --git a/.../progressreport/test_report_complement.py → ...progress_report/test_report_complement.py b/.../progressreport/test_report_complement.py → ...progress_report/test_report_complement.py
@@ -1,6 +1,6 @@
 import pytest
 
-from atpbar.progressreport.complement import ProgressReportComplementer
+from atpbar.progress_report.complement import ProgressReportComplementer
 
 
 @pytest.fixture()

diff --git a/tests/progressreport/test_reporter.py → tests/progress_report/test_reporter.py b/tests/progressreport/test_reporter.py → tests/progress_report/test_reporter.py
@@ -4,7 +4,7 @@
 
 import unittest.mock as mock
 
-from atpbar.progressreport.reporter import ProgressReporter
+from atpbar.progress_report.reporter import ProgressReporter
 
 
 @pytest.fixture()
@@ -15,7 +15,7 @@ def mock_queue():
 @pytest.fixture()
 def mock_time(monkeypatch):
     ret = mock.Mock()
-    module = sys.modules["atpbar.progressreport.reporter"]
+    module = sys.modules["atpbar.progress_report.reporter"]
     monkeypatch.setattr(module, "time", ret)
     return ret
 

diff --git a/tests/scenarios/conftest.py b/tests/scenarios/conftest.py
@@ -84,6 +84,6 @@ def machine(monkeypatch):
 
 @pytest.fixture(autouse=True)
 def reporter_interval(monkeypatch):
-    module = sys.modules["atpbar.progressreport.reporter"]
+    module = sys.modules["atpbar.progress_report.reporter"]
     monkeypatch.setattr(module, "DEFAULT_INTERVAL", 0)
     yield