From fe5389d698aa5bafb7f9b786f0a54fc37228e9c3 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Sat, 28 Dec 2024 17:29:38 +1000 Subject: [PATCH] packaging: Try using uv workspaces. --- eris/LICENSE | 1 - eris/{eris => }/__init__.py | 0 eris/{eris => }/__main__.py | 0 eris/{eris => }/paged_list.py | 0 eris/{eris => }/pydoc_color.py | 0 eris/{eris => }/tools.py | 0 eris/{eris => }/tools.toml | 0 eris/{eris => }/webserver.py | 0 eris/{eris => }/worker.py | 0 fill3/pyproject.toml | 5 ++- fill3/uv.lock | 27 ------------- lscolors/pyproject.toml | 5 ++- lscolors/uv.lock | 27 ------------- eris/pyproject.toml => pyproject.toml | 14 +++++-- termstr/pyproject.toml | 1 - termstr/uv.lock | 19 --------- {eris/tests => tests}/__main___test.py | 0 {eris/tests => tests}/golden-files/help | 0 {eris/tests => tests}/golden-files/initial | 0 .../golden-files/input/circle.bmp | Bin .../golden-files/input/circle.gif | Bin .../golden-files/input/circle.jpg | Bin .../golden-files/input/circle.png | Bin .../golden-files/input/circle.ppm | Bin .../golden-files/input/circle.tga | Bin .../golden-files/input/circle.tiff | Bin .../golden-files/input/clojure-util.java | 0 .../golden-files/input/hello.c | 0 .../golden-files/input/hello.cpp | 0 .../golden-files/input/hello.h | 0 .../golden-files/input/hi.html | 0 .../golden-files/input/hi.tar.bz2 | Bin .../golden-files/input/hi.tar.gz | Bin .../tests => tests}/golden-files/input/hi.tgz | Bin .../tests => tests}/golden-files/input/hi.zip | Bin .../tests => tests}/golden-files/input/hi3.py | 0 .../golden-files/input/hi3_test.py | 0 .../golden-files/input/hi_test.py | 0 .../golden-files/input/libieee.a | Bin .../golden-files/input/libpcprofile.so | Bin .../golden-files/input/perl.pl | 0 .../golden-files/input/root.php | 0 .../golden-files/input/rotatingtree.o | Bin .../golden-files/input/standard.pdf | Bin .../golden-files/input/test_foo.py | 0 {eris/tests => tests}/golden-files/log | 0 .../tests => tests}/golden-files/log-original | 0 .../results/antic-closure-util_java | 0 .../results/c_syntax_clang-hello_c | 0 .../golden-files/results/c_syntax_gcc-hello_c | 0 .../golden-files/results/contents-hi3_py | 0 .../results/cpp_syntax_clang-hello_cpp | 0 .../results/cpp_syntax_gcc-hello_cpp | 0 .../golden-files/results/html2text-hi_html | 0 .../golden-files/results/html_syntax-hi_html | 0 .../results/jlint-javaversion_class | 0 .../golden-files/results/metadata-hi3_py | 0 .../golden-files/results/mypy-hi3_py | 0 .../golden-files/results/nm-libieee_a | 0 .../golden-files/results/nm-libpcprofile_so | 0 .../objdump_disassemble-rotatingtree_o | 0 .../results/objdump_headers-rotatingtree_o | 0 .../golden-files/results/pdf2txt-standard_pdf | 0 .../golden-files/results/perl_syntax-perl_pl | 0 .../golden-files/results/perltidy-perl_pl | 0 .../golden-files/results/php8_syntax-root_php | 0 .../golden-files/results/pil-circle_bmp | 0 .../golden-files/results/pil-circle_gif | 0 .../golden-files/results/pil-circle_jpg | 0 .../golden-files/results/pil-circle_png | 0 .../golden-files/results/pil-circle_ppm | 0 .../golden-files/results/pil-circle_tga | 0 .../golden-files/results/pil-circle_tiff | 0 .../golden-files/results/pil_half-circle_png | 0 .../golden-files/results/pycodestyle-hi3_py | 0 .../golden-files/results/pyflakes-hi3_py | 0 .../golden-files/results/pylint-hi3_py | 0 .../golden-files/results/python_gut-hi3_py | 0 .../golden-files/results/python_mccabe-hi3_py | 0 .../results/python_modulefinder-hi3_py | 0 .../golden-files/results/python_syntax-hi3_py | 0 .../results/python_unittests-hi3_py | 0 .../results/python_unittests-hi3_test_py | 0 .../results/python_unittests-test_foo_py | 0 .../results/readelf-rotatingtree_o | 0 .../golden-files/results/zipinfo-hi_zip | 0 .../golden-files/summary-initial | 0 .../golden-files/summary-one-element | 0 .../golden-files/summary-two-element | 0 .../golden-files/window-orientation | 0 .../golden-files/window-orientation-original | 0 {eris/tests => tests}/golden.py | 0 {eris/tests => tests}/paged_list_test.py | 0 {eris/tests => tests}/tools_test.py | 0 {eris/tests => tests}/worker_test.py | 0 eris/uv.lock => uv.lock | 37 +++++++++++++----- 96 files changed, 46 insertions(+), 90 deletions(-) delete mode 120000 eris/LICENSE rename eris/{eris => }/__init__.py (100%) rename eris/{eris => }/__main__.py (100%) rename eris/{eris => }/paged_list.py (100%) rename eris/{eris => }/pydoc_color.py (100%) rename eris/{eris => }/tools.py (100%) rename eris/{eris => }/tools.toml (100%) rename eris/{eris => }/webserver.py (100%) rename eris/{eris => }/worker.py (100%) delete mode 100644 fill3/uv.lock delete mode 100644 lscolors/uv.lock rename eris/pyproject.toml => pyproject.toml (74%) delete mode 100644 termstr/uv.lock rename {eris/tests => tests}/__main___test.py (100%) rename {eris/tests => tests}/golden-files/help (100%) rename {eris/tests => tests}/golden-files/initial (100%) rename {eris/tests => tests}/golden-files/input/circle.bmp (100%) rename {eris/tests => tests}/golden-files/input/circle.gif (100%) rename {eris/tests => tests}/golden-files/input/circle.jpg (100%) rename {eris/tests => tests}/golden-files/input/circle.png (100%) rename {eris/tests => tests}/golden-files/input/circle.ppm (100%) rename {eris/tests => tests}/golden-files/input/circle.tga (100%) rename {eris/tests => tests}/golden-files/input/circle.tiff (100%) rename {eris/tests => tests}/golden-files/input/clojure-util.java (100%) rename {eris/tests => tests}/golden-files/input/hello.c (100%) rename {eris/tests => tests}/golden-files/input/hello.cpp (100%) rename {eris/tests => tests}/golden-files/input/hello.h (100%) rename {eris/tests => tests}/golden-files/input/hi.html (100%) rename {eris/tests => tests}/golden-files/input/hi.tar.bz2 (100%) rename {eris/tests => tests}/golden-files/input/hi.tar.gz (100%) rename {eris/tests => tests}/golden-files/input/hi.tgz (100%) rename {eris/tests => tests}/golden-files/input/hi.zip (100%) rename {eris/tests => tests}/golden-files/input/hi3.py (100%) rename {eris/tests => tests}/golden-files/input/hi3_test.py (100%) rename {eris/tests => tests}/golden-files/input/hi_test.py (100%) rename {eris/tests => tests}/golden-files/input/libieee.a (100%) rename {eris/tests => tests}/golden-files/input/libpcprofile.so (100%) rename {eris/tests => tests}/golden-files/input/perl.pl (100%) rename {eris/tests => tests}/golden-files/input/root.php (100%) rename {eris/tests => tests}/golden-files/input/rotatingtree.o (100%) rename {eris/tests => tests}/golden-files/input/standard.pdf (100%) rename {eris/tests => tests}/golden-files/input/test_foo.py (100%) rename {eris/tests => tests}/golden-files/log (100%) rename {eris/tests => tests}/golden-files/log-original (100%) rename {eris/tests => tests}/golden-files/results/antic-closure-util_java (100%) rename {eris/tests => tests}/golden-files/results/c_syntax_clang-hello_c (100%) rename {eris/tests => tests}/golden-files/results/c_syntax_gcc-hello_c (100%) rename {eris/tests => tests}/golden-files/results/contents-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/cpp_syntax_clang-hello_cpp (100%) rename {eris/tests => tests}/golden-files/results/cpp_syntax_gcc-hello_cpp (100%) rename {eris/tests => tests}/golden-files/results/html2text-hi_html (100%) rename {eris/tests => tests}/golden-files/results/html_syntax-hi_html (100%) rename {eris/tests => tests}/golden-files/results/jlint-javaversion_class (100%) rename {eris/tests => tests}/golden-files/results/metadata-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/mypy-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/nm-libieee_a (100%) rename {eris/tests => tests}/golden-files/results/nm-libpcprofile_so (100%) rename {eris/tests => tests}/golden-files/results/objdump_disassemble-rotatingtree_o (100%) rename {eris/tests => tests}/golden-files/results/objdump_headers-rotatingtree_o (100%) rename {eris/tests => tests}/golden-files/results/pdf2txt-standard_pdf (100%) rename {eris/tests => tests}/golden-files/results/perl_syntax-perl_pl (100%) rename {eris/tests => tests}/golden-files/results/perltidy-perl_pl (100%) rename {eris/tests => tests}/golden-files/results/php8_syntax-root_php (100%) rename {eris/tests => tests}/golden-files/results/pil-circle_bmp (100%) rename {eris/tests => tests}/golden-files/results/pil-circle_gif (100%) rename {eris/tests => tests}/golden-files/results/pil-circle_jpg (100%) rename {eris/tests => tests}/golden-files/results/pil-circle_png (100%) rename {eris/tests => tests}/golden-files/results/pil-circle_ppm (100%) rename {eris/tests => tests}/golden-files/results/pil-circle_tga (100%) rename {eris/tests => tests}/golden-files/results/pil-circle_tiff (100%) rename {eris/tests => tests}/golden-files/results/pil_half-circle_png (100%) rename {eris/tests => tests}/golden-files/results/pycodestyle-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/pyflakes-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/pylint-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/python_gut-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/python_mccabe-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/python_modulefinder-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/python_syntax-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/python_unittests-hi3_py (100%) rename {eris/tests => tests}/golden-files/results/python_unittests-hi3_test_py (100%) rename {eris/tests => tests}/golden-files/results/python_unittests-test_foo_py (100%) rename {eris/tests => tests}/golden-files/results/readelf-rotatingtree_o (100%) rename {eris/tests => tests}/golden-files/results/zipinfo-hi_zip (100%) rename {eris/tests => tests}/golden-files/summary-initial (100%) rename {eris/tests => tests}/golden-files/summary-one-element (100%) rename {eris/tests => tests}/golden-files/summary-two-element (100%) rename {eris/tests => tests}/golden-files/window-orientation (100%) rename {eris/tests => tests}/golden-files/window-orientation-original (100%) rename {eris/tests => tests}/golden.py (100%) rename {eris/tests => tests}/paged_list_test.py (100%) rename {eris/tests => tests}/tools_test.py (100%) rename {eris/tests => tests}/worker_test.py (100%) rename eris/uv.lock => uv.lock (93%) diff --git a/eris/LICENSE b/eris/LICENSE deleted file mode 120000 index ea5b606..0000000 --- a/eris/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/eris/eris/__init__.py b/eris/__init__.py similarity index 100% rename from eris/eris/__init__.py rename to eris/__init__.py diff --git a/eris/eris/__main__.py b/eris/__main__.py similarity index 100% rename from eris/eris/__main__.py rename to eris/__main__.py diff --git a/eris/eris/paged_list.py b/eris/paged_list.py similarity index 100% rename from eris/eris/paged_list.py rename to eris/paged_list.py diff --git a/eris/eris/pydoc_color.py b/eris/pydoc_color.py similarity index 100% rename from eris/eris/pydoc_color.py rename to eris/pydoc_color.py diff --git a/eris/eris/tools.py b/eris/tools.py similarity index 100% rename from eris/eris/tools.py rename to eris/tools.py diff --git a/eris/eris/tools.toml b/eris/tools.toml similarity index 100% rename from eris/eris/tools.toml rename to eris/tools.toml diff --git a/eris/eris/webserver.py b/eris/webserver.py similarity index 100% rename from eris/eris/webserver.py rename to eris/webserver.py diff --git a/eris/eris/worker.py b/eris/worker.py similarity index 100% rename from eris/eris/worker.py rename to eris/worker.py diff --git a/fill3/pyproject.toml b/fill3/pyproject.toml index 8154e6f..0893327 100644 --- a/fill3/pyproject.toml +++ b/fill3/pyproject.toml @@ -9,8 +9,11 @@ authors = [ ] requires-python = ">=3.11" dependencies = [ - "termstr @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=termstr", + "termstr", ] [project.urls] Homepage = "https://github.com/ahamilton/eris" + +[tool.uv.sources] +termstr = { workspace = true } diff --git a/fill3/uv.lock b/fill3/uv.lock deleted file mode 100644 index 6e50813..0000000 --- a/fill3/uv.lock +++ /dev/null @@ -1,27 +0,0 @@ -version = 1 -requires-python = ">=3.11" - -[[package]] -name = "cwcwidth" -version = "0.1.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/38/17/aadd0c6190dca91aa27c4d7e84d69d30fdf4966e7764247cdc395f8fe7d9/cwcwidth-0.1.5.tar.gz", hash = "sha256:2c840e7d85f6de45c45986b416d79312c91882e1121b78d4c347e49c4238c09d", size = 11071 } - -[[package]] -name = "fill3" -version = "2024.12.18" -source = { editable = "." } -dependencies = [ - { name = "termstr" }, -] - -[package.metadata] -requires-dist = [{ name = "termstr", git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18" }] - -[[package]] -name = "termstr" -version = "2024.12.18" -source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } -dependencies = [ - { name = "cwcwidth" }, -] diff --git a/lscolors/pyproject.toml b/lscolors/pyproject.toml index 3498018..e2a2617 100644 --- a/lscolors/pyproject.toml +++ b/lscolors/pyproject.toml @@ -14,9 +14,12 @@ authors = [ ] requires-python = ">=3.11" dependencies = [ - "termstr @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=termstr", + "termstr", ] +[tool.uv.sources] +termstr = { workspace = true } + [project.urls] Homepage = "https://github.com/ahamilton/eris" diff --git a/lscolors/uv.lock b/lscolors/uv.lock deleted file mode 100644 index aa9ed5a..0000000 --- a/lscolors/uv.lock +++ /dev/null @@ -1,27 +0,0 @@ -version = 1 -requires-python = ">=3.11" - -[[package]] -name = "cwcwidth" -version = "0.1.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/38/17/aadd0c6190dca91aa27c4d7e84d69d30fdf4966e7764247cdc395f8fe7d9/cwcwidth-0.1.5.tar.gz", hash = "sha256:2c840e7d85f6de45c45986b416d79312c91882e1121b78d4c347e49c4238c09d", size = 11071 } - -[[package]] -name = "lscolors" -version = "2024.12.18" -source = { editable = "." } -dependencies = [ - { name = "termstr" }, -] - -[package.metadata] -requires-dist = [{ name = "termstr", git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18" }] - -[[package]] -name = "termstr" -version = "2024.12.18" -source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } -dependencies = [ - { name = "cwcwidth" }, -] diff --git a/eris/pyproject.toml b/pyproject.toml similarity index 74% rename from eris/pyproject.toml rename to pyproject.toml index 38e45d1..f155617 100644 --- a/eris/pyproject.toml +++ b/pyproject.toml @@ -12,16 +12,24 @@ requires-python = ">=3.11" dependencies = [ "decorator==5.1.1", "docopt==0.6.2", - "fill3 @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=fill3", - "lscolors @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=lscolors", + "fill3", + "lscolors", "pexpect==4.8.0", "pillow==10.0.0", "pygments==2.16.1", "pyinotify==0.9.6", - "termstr @ git+https://gitlab.com/ahamilton/eris@v2024.12.18#subdirectory=termstr", + "termstr", "toml==0.10.2", ] +[tool.uv.sources] +fill3 = { workspace = true } +lscolors = { workspace = true } +termstr = { workspace = true } + +[tool.uv.workspace] +members = ["termstr", "fill3", "lscolors"] + [project.scripts] eris = "eris.__main__:entry_point" eris-worker = "eris.worker:main" diff --git a/termstr/pyproject.toml b/termstr/pyproject.toml index 6b79af4..c3d8639 100644 --- a/termstr/pyproject.toml +++ b/termstr/pyproject.toml @@ -12,4 +12,3 @@ dependencies = [ [project.urls] Homepage = "https://github.com/ahamilton/eris" - diff --git a/termstr/uv.lock b/termstr/uv.lock deleted file mode 100644 index e212787..0000000 --- a/termstr/uv.lock +++ /dev/null @@ -1,19 +0,0 @@ -version = 1 -requires-python = ">=3.11" - -[[package]] -name = "cwcwidth" -version = "0.1.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/38/17/aadd0c6190dca91aa27c4d7e84d69d30fdf4966e7764247cdc395f8fe7d9/cwcwidth-0.1.5.tar.gz", hash = "sha256:2c840e7d85f6de45c45986b416d79312c91882e1121b78d4c347e49c4238c09d", size = 11071 } - -[[package]] -name = "termstr" -version = "2024.12.18" -source = { virtual = "." } -dependencies = [ - { name = "cwcwidth" }, -] - -[package.metadata] -requires-dist = [{ name = "cwcwidth", specifier = "==0.1.5" }] diff --git a/eris/tests/__main___test.py b/tests/__main___test.py similarity index 100% rename from eris/tests/__main___test.py rename to tests/__main___test.py diff --git a/eris/tests/golden-files/help b/tests/golden-files/help similarity index 100% rename from eris/tests/golden-files/help rename to tests/golden-files/help diff --git a/eris/tests/golden-files/initial b/tests/golden-files/initial similarity index 100% rename from eris/tests/golden-files/initial rename to tests/golden-files/initial diff --git a/eris/tests/golden-files/input/circle.bmp b/tests/golden-files/input/circle.bmp similarity index 100% rename from eris/tests/golden-files/input/circle.bmp rename to tests/golden-files/input/circle.bmp diff --git a/eris/tests/golden-files/input/circle.gif b/tests/golden-files/input/circle.gif similarity index 100% rename from eris/tests/golden-files/input/circle.gif rename to tests/golden-files/input/circle.gif diff --git a/eris/tests/golden-files/input/circle.jpg b/tests/golden-files/input/circle.jpg similarity index 100% rename from eris/tests/golden-files/input/circle.jpg rename to tests/golden-files/input/circle.jpg diff --git a/eris/tests/golden-files/input/circle.png b/tests/golden-files/input/circle.png similarity index 100% rename from eris/tests/golden-files/input/circle.png rename to tests/golden-files/input/circle.png diff --git a/eris/tests/golden-files/input/circle.ppm b/tests/golden-files/input/circle.ppm similarity index 100% rename from eris/tests/golden-files/input/circle.ppm rename to tests/golden-files/input/circle.ppm diff --git a/eris/tests/golden-files/input/circle.tga b/tests/golden-files/input/circle.tga similarity index 100% rename from eris/tests/golden-files/input/circle.tga rename to tests/golden-files/input/circle.tga diff --git a/eris/tests/golden-files/input/circle.tiff b/tests/golden-files/input/circle.tiff similarity index 100% rename from eris/tests/golden-files/input/circle.tiff rename to tests/golden-files/input/circle.tiff diff --git a/eris/tests/golden-files/input/clojure-util.java b/tests/golden-files/input/clojure-util.java similarity index 100% rename from eris/tests/golden-files/input/clojure-util.java rename to tests/golden-files/input/clojure-util.java diff --git a/eris/tests/golden-files/input/hello.c b/tests/golden-files/input/hello.c similarity index 100% rename from eris/tests/golden-files/input/hello.c rename to tests/golden-files/input/hello.c diff --git a/eris/tests/golden-files/input/hello.cpp b/tests/golden-files/input/hello.cpp similarity index 100% rename from eris/tests/golden-files/input/hello.cpp rename to tests/golden-files/input/hello.cpp diff --git a/eris/tests/golden-files/input/hello.h b/tests/golden-files/input/hello.h similarity index 100% rename from eris/tests/golden-files/input/hello.h rename to tests/golden-files/input/hello.h diff --git a/eris/tests/golden-files/input/hi.html b/tests/golden-files/input/hi.html similarity index 100% rename from eris/tests/golden-files/input/hi.html rename to tests/golden-files/input/hi.html diff --git a/eris/tests/golden-files/input/hi.tar.bz2 b/tests/golden-files/input/hi.tar.bz2 similarity index 100% rename from eris/tests/golden-files/input/hi.tar.bz2 rename to tests/golden-files/input/hi.tar.bz2 diff --git a/eris/tests/golden-files/input/hi.tar.gz b/tests/golden-files/input/hi.tar.gz similarity index 100% rename from eris/tests/golden-files/input/hi.tar.gz rename to tests/golden-files/input/hi.tar.gz diff --git a/eris/tests/golden-files/input/hi.tgz b/tests/golden-files/input/hi.tgz similarity index 100% rename from eris/tests/golden-files/input/hi.tgz rename to tests/golden-files/input/hi.tgz diff --git a/eris/tests/golden-files/input/hi.zip b/tests/golden-files/input/hi.zip similarity index 100% rename from eris/tests/golden-files/input/hi.zip rename to tests/golden-files/input/hi.zip diff --git a/eris/tests/golden-files/input/hi3.py b/tests/golden-files/input/hi3.py similarity index 100% rename from eris/tests/golden-files/input/hi3.py rename to tests/golden-files/input/hi3.py diff --git a/eris/tests/golden-files/input/hi3_test.py b/tests/golden-files/input/hi3_test.py similarity index 100% rename from eris/tests/golden-files/input/hi3_test.py rename to tests/golden-files/input/hi3_test.py diff --git a/eris/tests/golden-files/input/hi_test.py b/tests/golden-files/input/hi_test.py similarity index 100% rename from eris/tests/golden-files/input/hi_test.py rename to tests/golden-files/input/hi_test.py diff --git a/eris/tests/golden-files/input/libieee.a b/tests/golden-files/input/libieee.a similarity index 100% rename from eris/tests/golden-files/input/libieee.a rename to tests/golden-files/input/libieee.a diff --git a/eris/tests/golden-files/input/libpcprofile.so b/tests/golden-files/input/libpcprofile.so similarity index 100% rename from eris/tests/golden-files/input/libpcprofile.so rename to tests/golden-files/input/libpcprofile.so diff --git a/eris/tests/golden-files/input/perl.pl b/tests/golden-files/input/perl.pl similarity index 100% rename from eris/tests/golden-files/input/perl.pl rename to tests/golden-files/input/perl.pl diff --git a/eris/tests/golden-files/input/root.php b/tests/golden-files/input/root.php similarity index 100% rename from eris/tests/golden-files/input/root.php rename to tests/golden-files/input/root.php diff --git a/eris/tests/golden-files/input/rotatingtree.o b/tests/golden-files/input/rotatingtree.o similarity index 100% rename from eris/tests/golden-files/input/rotatingtree.o rename to tests/golden-files/input/rotatingtree.o diff --git a/eris/tests/golden-files/input/standard.pdf b/tests/golden-files/input/standard.pdf similarity index 100% rename from eris/tests/golden-files/input/standard.pdf rename to tests/golden-files/input/standard.pdf diff --git a/eris/tests/golden-files/input/test_foo.py b/tests/golden-files/input/test_foo.py similarity index 100% rename from eris/tests/golden-files/input/test_foo.py rename to tests/golden-files/input/test_foo.py diff --git a/eris/tests/golden-files/log b/tests/golden-files/log similarity index 100% rename from eris/tests/golden-files/log rename to tests/golden-files/log diff --git a/eris/tests/golden-files/log-original b/tests/golden-files/log-original similarity index 100% rename from eris/tests/golden-files/log-original rename to tests/golden-files/log-original diff --git a/eris/tests/golden-files/results/antic-closure-util_java b/tests/golden-files/results/antic-closure-util_java similarity index 100% rename from eris/tests/golden-files/results/antic-closure-util_java rename to tests/golden-files/results/antic-closure-util_java diff --git a/eris/tests/golden-files/results/c_syntax_clang-hello_c b/tests/golden-files/results/c_syntax_clang-hello_c similarity index 100% rename from eris/tests/golden-files/results/c_syntax_clang-hello_c rename to tests/golden-files/results/c_syntax_clang-hello_c diff --git a/eris/tests/golden-files/results/c_syntax_gcc-hello_c b/tests/golden-files/results/c_syntax_gcc-hello_c similarity index 100% rename from eris/tests/golden-files/results/c_syntax_gcc-hello_c rename to tests/golden-files/results/c_syntax_gcc-hello_c diff --git a/eris/tests/golden-files/results/contents-hi3_py b/tests/golden-files/results/contents-hi3_py similarity index 100% rename from eris/tests/golden-files/results/contents-hi3_py rename to tests/golden-files/results/contents-hi3_py diff --git a/eris/tests/golden-files/results/cpp_syntax_clang-hello_cpp b/tests/golden-files/results/cpp_syntax_clang-hello_cpp similarity index 100% rename from eris/tests/golden-files/results/cpp_syntax_clang-hello_cpp rename to tests/golden-files/results/cpp_syntax_clang-hello_cpp diff --git a/eris/tests/golden-files/results/cpp_syntax_gcc-hello_cpp b/tests/golden-files/results/cpp_syntax_gcc-hello_cpp similarity index 100% rename from eris/tests/golden-files/results/cpp_syntax_gcc-hello_cpp rename to tests/golden-files/results/cpp_syntax_gcc-hello_cpp diff --git a/eris/tests/golden-files/results/html2text-hi_html b/tests/golden-files/results/html2text-hi_html similarity index 100% rename from eris/tests/golden-files/results/html2text-hi_html rename to tests/golden-files/results/html2text-hi_html diff --git a/eris/tests/golden-files/results/html_syntax-hi_html b/tests/golden-files/results/html_syntax-hi_html similarity index 100% rename from eris/tests/golden-files/results/html_syntax-hi_html rename to tests/golden-files/results/html_syntax-hi_html diff --git a/eris/tests/golden-files/results/jlint-javaversion_class b/tests/golden-files/results/jlint-javaversion_class similarity index 100% rename from eris/tests/golden-files/results/jlint-javaversion_class rename to tests/golden-files/results/jlint-javaversion_class diff --git a/eris/tests/golden-files/results/metadata-hi3_py b/tests/golden-files/results/metadata-hi3_py similarity index 100% rename from eris/tests/golden-files/results/metadata-hi3_py rename to tests/golden-files/results/metadata-hi3_py diff --git a/eris/tests/golden-files/results/mypy-hi3_py b/tests/golden-files/results/mypy-hi3_py similarity index 100% rename from eris/tests/golden-files/results/mypy-hi3_py rename to tests/golden-files/results/mypy-hi3_py diff --git a/eris/tests/golden-files/results/nm-libieee_a b/tests/golden-files/results/nm-libieee_a similarity index 100% rename from eris/tests/golden-files/results/nm-libieee_a rename to tests/golden-files/results/nm-libieee_a diff --git a/eris/tests/golden-files/results/nm-libpcprofile_so b/tests/golden-files/results/nm-libpcprofile_so similarity index 100% rename from eris/tests/golden-files/results/nm-libpcprofile_so rename to tests/golden-files/results/nm-libpcprofile_so diff --git a/eris/tests/golden-files/results/objdump_disassemble-rotatingtree_o b/tests/golden-files/results/objdump_disassemble-rotatingtree_o similarity index 100% rename from eris/tests/golden-files/results/objdump_disassemble-rotatingtree_o rename to tests/golden-files/results/objdump_disassemble-rotatingtree_o diff --git a/eris/tests/golden-files/results/objdump_headers-rotatingtree_o b/tests/golden-files/results/objdump_headers-rotatingtree_o similarity index 100% rename from eris/tests/golden-files/results/objdump_headers-rotatingtree_o rename to tests/golden-files/results/objdump_headers-rotatingtree_o diff --git a/eris/tests/golden-files/results/pdf2txt-standard_pdf b/tests/golden-files/results/pdf2txt-standard_pdf similarity index 100% rename from eris/tests/golden-files/results/pdf2txt-standard_pdf rename to tests/golden-files/results/pdf2txt-standard_pdf diff --git a/eris/tests/golden-files/results/perl_syntax-perl_pl b/tests/golden-files/results/perl_syntax-perl_pl similarity index 100% rename from eris/tests/golden-files/results/perl_syntax-perl_pl rename to tests/golden-files/results/perl_syntax-perl_pl diff --git a/eris/tests/golden-files/results/perltidy-perl_pl b/tests/golden-files/results/perltidy-perl_pl similarity index 100% rename from eris/tests/golden-files/results/perltidy-perl_pl rename to tests/golden-files/results/perltidy-perl_pl diff --git a/eris/tests/golden-files/results/php8_syntax-root_php b/tests/golden-files/results/php8_syntax-root_php similarity index 100% rename from eris/tests/golden-files/results/php8_syntax-root_php rename to tests/golden-files/results/php8_syntax-root_php diff --git a/eris/tests/golden-files/results/pil-circle_bmp b/tests/golden-files/results/pil-circle_bmp similarity index 100% rename from eris/tests/golden-files/results/pil-circle_bmp rename to tests/golden-files/results/pil-circle_bmp diff --git a/eris/tests/golden-files/results/pil-circle_gif b/tests/golden-files/results/pil-circle_gif similarity index 100% rename from eris/tests/golden-files/results/pil-circle_gif rename to tests/golden-files/results/pil-circle_gif diff --git a/eris/tests/golden-files/results/pil-circle_jpg b/tests/golden-files/results/pil-circle_jpg similarity index 100% rename from eris/tests/golden-files/results/pil-circle_jpg rename to tests/golden-files/results/pil-circle_jpg diff --git a/eris/tests/golden-files/results/pil-circle_png b/tests/golden-files/results/pil-circle_png similarity index 100% rename from eris/tests/golden-files/results/pil-circle_png rename to tests/golden-files/results/pil-circle_png diff --git a/eris/tests/golden-files/results/pil-circle_ppm b/tests/golden-files/results/pil-circle_ppm similarity index 100% rename from eris/tests/golden-files/results/pil-circle_ppm rename to tests/golden-files/results/pil-circle_ppm diff --git a/eris/tests/golden-files/results/pil-circle_tga b/tests/golden-files/results/pil-circle_tga similarity index 100% rename from eris/tests/golden-files/results/pil-circle_tga rename to tests/golden-files/results/pil-circle_tga diff --git a/eris/tests/golden-files/results/pil-circle_tiff b/tests/golden-files/results/pil-circle_tiff similarity index 100% rename from eris/tests/golden-files/results/pil-circle_tiff rename to tests/golden-files/results/pil-circle_tiff diff --git a/eris/tests/golden-files/results/pil_half-circle_png b/tests/golden-files/results/pil_half-circle_png similarity index 100% rename from eris/tests/golden-files/results/pil_half-circle_png rename to tests/golden-files/results/pil_half-circle_png diff --git a/eris/tests/golden-files/results/pycodestyle-hi3_py b/tests/golden-files/results/pycodestyle-hi3_py similarity index 100% rename from eris/tests/golden-files/results/pycodestyle-hi3_py rename to tests/golden-files/results/pycodestyle-hi3_py diff --git a/eris/tests/golden-files/results/pyflakes-hi3_py b/tests/golden-files/results/pyflakes-hi3_py similarity index 100% rename from eris/tests/golden-files/results/pyflakes-hi3_py rename to tests/golden-files/results/pyflakes-hi3_py diff --git a/eris/tests/golden-files/results/pylint-hi3_py b/tests/golden-files/results/pylint-hi3_py similarity index 100% rename from eris/tests/golden-files/results/pylint-hi3_py rename to tests/golden-files/results/pylint-hi3_py diff --git a/eris/tests/golden-files/results/python_gut-hi3_py b/tests/golden-files/results/python_gut-hi3_py similarity index 100% rename from eris/tests/golden-files/results/python_gut-hi3_py rename to tests/golden-files/results/python_gut-hi3_py diff --git a/eris/tests/golden-files/results/python_mccabe-hi3_py b/tests/golden-files/results/python_mccabe-hi3_py similarity index 100% rename from eris/tests/golden-files/results/python_mccabe-hi3_py rename to tests/golden-files/results/python_mccabe-hi3_py diff --git a/eris/tests/golden-files/results/python_modulefinder-hi3_py b/tests/golden-files/results/python_modulefinder-hi3_py similarity index 100% rename from eris/tests/golden-files/results/python_modulefinder-hi3_py rename to tests/golden-files/results/python_modulefinder-hi3_py diff --git a/eris/tests/golden-files/results/python_syntax-hi3_py b/tests/golden-files/results/python_syntax-hi3_py similarity index 100% rename from eris/tests/golden-files/results/python_syntax-hi3_py rename to tests/golden-files/results/python_syntax-hi3_py diff --git a/eris/tests/golden-files/results/python_unittests-hi3_py b/tests/golden-files/results/python_unittests-hi3_py similarity index 100% rename from eris/tests/golden-files/results/python_unittests-hi3_py rename to tests/golden-files/results/python_unittests-hi3_py diff --git a/eris/tests/golden-files/results/python_unittests-hi3_test_py b/tests/golden-files/results/python_unittests-hi3_test_py similarity index 100% rename from eris/tests/golden-files/results/python_unittests-hi3_test_py rename to tests/golden-files/results/python_unittests-hi3_test_py diff --git a/eris/tests/golden-files/results/python_unittests-test_foo_py b/tests/golden-files/results/python_unittests-test_foo_py similarity index 100% rename from eris/tests/golden-files/results/python_unittests-test_foo_py rename to tests/golden-files/results/python_unittests-test_foo_py diff --git a/eris/tests/golden-files/results/readelf-rotatingtree_o b/tests/golden-files/results/readelf-rotatingtree_o similarity index 100% rename from eris/tests/golden-files/results/readelf-rotatingtree_o rename to tests/golden-files/results/readelf-rotatingtree_o diff --git a/eris/tests/golden-files/results/zipinfo-hi_zip b/tests/golden-files/results/zipinfo-hi_zip similarity index 100% rename from eris/tests/golden-files/results/zipinfo-hi_zip rename to tests/golden-files/results/zipinfo-hi_zip diff --git a/eris/tests/golden-files/summary-initial b/tests/golden-files/summary-initial similarity index 100% rename from eris/tests/golden-files/summary-initial rename to tests/golden-files/summary-initial diff --git a/eris/tests/golden-files/summary-one-element b/tests/golden-files/summary-one-element similarity index 100% rename from eris/tests/golden-files/summary-one-element rename to tests/golden-files/summary-one-element diff --git a/eris/tests/golden-files/summary-two-element b/tests/golden-files/summary-two-element similarity index 100% rename from eris/tests/golden-files/summary-two-element rename to tests/golden-files/summary-two-element diff --git a/eris/tests/golden-files/window-orientation b/tests/golden-files/window-orientation similarity index 100% rename from eris/tests/golden-files/window-orientation rename to tests/golden-files/window-orientation diff --git a/eris/tests/golden-files/window-orientation-original b/tests/golden-files/window-orientation-original similarity index 100% rename from eris/tests/golden-files/window-orientation-original rename to tests/golden-files/window-orientation-original diff --git a/eris/tests/golden.py b/tests/golden.py similarity index 100% rename from eris/tests/golden.py rename to tests/golden.py diff --git a/eris/tests/paged_list_test.py b/tests/paged_list_test.py similarity index 100% rename from eris/tests/paged_list_test.py rename to tests/paged_list_test.py diff --git a/eris/tests/tools_test.py b/tests/tools_test.py similarity index 100% rename from eris/tests/tools_test.py rename to tests/tools_test.py diff --git a/eris/tests/worker_test.py b/tests/worker_test.py similarity index 100% rename from eris/tests/worker_test.py rename to tests/worker_test.py diff --git a/eris/uv.lock b/uv.lock similarity index 93% rename from eris/uv.lock rename to uv.lock index 63e018b..16a0021 100644 --- a/eris/uv.lock +++ b/uv.lock @@ -1,6 +1,14 @@ version = 1 requires-python = ">=3.11" +[manifest] +members = [ + "eris", + "fill3", + "lscolors", + "termstr", +] + [[package]] name = "cwcwidth" version = "0.1.5" @@ -24,7 +32,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/a2/55/8f8cab2afd404cf57 [[package]] name = "eris" -version = "2024.12.18" +version = "2024.12.20" source = { editable = "." } dependencies = [ { name = "decorator" }, @@ -43,32 +51,38 @@ dependencies = [ requires-dist = [ { name = "decorator", specifier = "==5.1.1" }, { name = "docopt", specifier = "==0.6.2" }, - { name = "fill3", git = "https://gitlab.com/ahamilton/eris?subdirectory=fill3&rev=v2024.12.18" }, - { name = "lscolors", git = "https://gitlab.com/ahamilton/eris?subdirectory=lscolors&rev=v2024.12.18" }, + { name = "fill3", editable = "fill3" }, + { name = "lscolors", editable = "lscolors" }, { name = "pexpect", specifier = "==4.8.0" }, { name = "pillow", specifier = "==10.0.0" }, { name = "pygments", specifier = "==2.16.1" }, { name = "pyinotify", specifier = "==0.9.6" }, - { name = "termstr", git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18" }, + { name = "termstr", virtual = "termstr" }, { name = "toml", specifier = "==0.10.2" }, ] [[package]] name = "fill3" -version = "2024.12.18" -source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=fill3&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } +version = "2024.12.20" +source = { editable = "fill3" } dependencies = [ { name = "termstr" }, ] +[package.metadata] +requires-dist = [{ name = "termstr", virtual = "termstr" }] + [[package]] name = "lscolors" -version = "2024.12.18" -source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=lscolors&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } +version = "2024.12.20" +source = { editable = "lscolors" } dependencies = [ { name = "termstr" }, ] +[package.metadata] +requires-dist = [{ name = "termstr", virtual = "termstr" }] + [[package]] name = "pexpect" version = "4.8.0" @@ -135,12 +149,15 @@ sdist = { url = "https://files.pythonhosted.org/packages/e3/c0/fd5b18dde17c12496 [[package]] name = "termstr" -version = "2024.12.18" -source = { git = "https://gitlab.com/ahamilton/eris?subdirectory=termstr&rev=v2024.12.18#42acd6db75cfb366e4f6b5de0bf7c7508eec6796" } +version = "2024.12.20" +source = { virtual = "termstr" } dependencies = [ { name = "cwcwidth" }, ] +[package.metadata] +requires-dist = [{ name = "cwcwidth", specifier = "==0.1.5" }] + [[package]] name = "toml" version = "0.10.2"