diff --git a/bin/ctt b/bin/ctt index 621420d..cb920f6 100755 --- a/bin/ctt +++ b/bin/ctt @@ -25,9 +25,8 @@ import subprocess import sys if __name__ == "__main__": - # Ensure our /lib/ is included into PYTHON_PATH here = os.path.dirname(os.path.realpath(__file__)) - lib = os.path.abspath(os.path.join(here, '../lib')) + lib = os.path.abspath(os.path.join(here, '..')) ctt_argv = [os.path.abspath(os.path.join(here, '../scripts/ctt'))] orig_pythonpath = os.getenv('PYTHONPATH', "") diff --git a/lib/ctt/__init__.py b/ctt/__init__.py similarity index 98% rename from lib/ctt/__init__.py rename to ctt/__init__.py index 71fdeb7..5348781 100644 --- a/lib/ctt/__init__.py +++ b/ctt/__init__.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # 2012 Nico Schottelius (nico-ctt at schottelius.org) diff --git a/lib/ctt/listprojects.py b/ctt/listprojects.py old mode 100755 new mode 100644 similarity index 98% rename from lib/ctt/listprojects.py rename to ctt/listprojects.py index 95bbe26..36df617 --- a/lib/ctt/listprojects.py +++ b/ctt/listprojects.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # 2012 Nico Schottelius (nico-ctt at schottelius.org) diff --git a/lib/ctt/report.py b/ctt/report.py old mode 100755 new mode 100644 similarity index 99% rename from lib/ctt/report.py rename to ctt/report.py index dcc5f03..619ce7d --- a/lib/ctt/report.py +++ b/ctt/report.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # 2012-2018 Nico Schottelius (nico-ctt at schottelius.org) diff --git a/lib/ctt/test/__init__.py b/ctt/test/__init__.py similarity index 100% rename from lib/ctt/test/__init__.py rename to ctt/test/__init__.py diff --git a/lib/ctt/test/__main__.py b/ctt/test/__main__.py similarity index 100% rename from lib/ctt/test/__main__.py rename to ctt/test/__main__.py diff --git a/lib/ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/comment b/ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/comment rename to ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/comment diff --git a/lib/ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/delta b/ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/delta rename to ctt/test/fixtures/.ctt/foo1/2016-04-07-0826/delta diff --git a/lib/ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/comment b/ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/comment rename to ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/comment diff --git a/lib/ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/delta b/ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/delta rename to ctt/test/fixtures/.ctt/foo1/2016-04-08-1200/delta diff --git a/lib/ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/comment b/ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/comment rename to ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/comment diff --git a/lib/ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/delta b/ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/delta rename to ctt/test/fixtures/.ctt/foo2/2016-04-07-0810/delta diff --git a/lib/ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/comment b/ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/comment rename to ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/comment diff --git a/lib/ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/delta b/ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/delta rename to ctt/test/fixtures/.ctt/foo3/2016-04-02-2110/delta diff --git a/lib/ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/comment b/ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/comment rename to ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/comment diff --git a/lib/ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/delta b/ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/delta rename to ctt/test/fixtures/.ctt/spam-eggs/2016-04-07-1229/delta diff --git a/lib/ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/comment b/ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/comment rename to ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/comment diff --git a/lib/ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/delta b/ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/delta rename to ctt/test/fixtures/.ctt/test-1/2016-04-02-2109/delta diff --git a/lib/ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/comment b/ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/comment rename to ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/comment diff --git a/lib/ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/delta b/ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/delta rename to ctt/test/fixtures/.ctt/test-2/2016-04-02-2109/delta diff --git a/lib/ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/comment b/ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/comment similarity index 100% rename from lib/ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/comment rename to ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/comment diff --git a/lib/ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/delta b/ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/delta similarity index 100% rename from lib/ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/delta rename to ctt/test/fixtures/.ctt/test-3/2016-04-02-2109/delta diff --git a/lib/ctt/test/test_listprojects.py b/ctt/test/test_listprojects.py similarity index 100% rename from lib/ctt/test/test_listprojects.py rename to ctt/test/test_listprojects.py diff --git a/lib/ctt/test/test_report.py b/ctt/test/test_report.py similarity index 100% rename from lib/ctt/test/test_report.py rename to ctt/test/test_report.py diff --git a/lib/ctt/test/test_tracker.py b/ctt/test/test_tracker.py similarity index 100% rename from lib/ctt/test/test_tracker.py rename to ctt/test/test_tracker.py diff --git a/lib/ctt/tracker.py b/ctt/tracker.py old mode 100755 new mode 100644 similarity index 99% rename from lib/ctt/tracker.py rename to ctt/tracker.py index 5133b2d..5d2ec97 --- a/lib/ctt/tracker.py +++ b/ctt/tracker.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # 2012 Nico Schottelius (nico-ctt at schottelius.org)