From a1144fd892183f31dbf2a8df527c86f506f76bbe Mon Sep 17 00:00:00 2001 From: rzuckerm Date: Fri, 11 Apr 2025 21:05:56 -0500 Subject: [PATCH 1/3] Modify Quine Testing --- .glotter.yml | 3 --- archive/b/befunge/quine.be | 2 +- archive/c/commodore-basic/testinfo.yml | 4 ++-- poetry.lock | 15 +++++++++------ pyproject.toml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.glotter.yml b/.glotter.yml index f3a4c2271..b5f21b8a9 100644 --- a/.glotter.yml +++ b/.glotter.yml @@ -1216,9 +1216,6 @@ projects: params: - expected: self: "" - transformations: - - "strip" - - "strip_expected" rot13: words: - "rot13" diff --git a/archive/b/befunge/quine.be b/archive/b/befunge/quine.be index fc36d1d34..34d4f5d23 100644 --- a/archive/b/befunge/quine.be +++ b/archive/b/befunge/quine.be @@ -1 +1 @@ -:#,_$$98+2*00$$,#00@#" +:0g,:66+`#@_1+ \ No newline at end of file diff --git a/archive/c/commodore-basic/testinfo.yml b/archive/c/commodore-basic/testinfo.yml index e631b03c3..325c64a55 100644 --- a/archive/c/commodore-basic/testinfo.yml +++ b/archive/c/commodore-basic/testinfo.yml @@ -9,9 +9,9 @@ container: sh -c '(echo "#!/bin/sh"; \ echo "if [ \"\$#\" = 0 ];"; \ echo "then"; \ - echo " cbmbasic {{ source.name }}{{ source.extension }};"; \ + echo " cbmbasic {{ source.name }}{{ source.extension }} | sed \"N;0s/^\\r\\n//\";"; \ echo "else"; \ - echo " printf \"%s\\n\" \"\$@\" | cbmbasic {{ source.name }}{{ source.extension }}"; \ + echo " printf \"%s\\n\" \"\$@\" | cbmbasic {{ source.name }}{{ source.extension }} | sed \"N;0s/^\\r\\n//\""; \ echo "fi" \ ) >{{ source.name }}' cmd: "sh ./{{ source.name }}" diff --git a/poetry.lock b/poetry.lock index 2423e5d44..af77304fc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -183,7 +183,7 @@ description = "Cross-platform colored terminal text." optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" groups = ["main"] -markers = "sys_platform == \"win32\" or platform_system == \"Windows\"" +markers = "platform_system == \"Windows\" or sys_platform == \"win32\"" files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, @@ -279,14 +279,13 @@ test = ["coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mock ; python_version < \"3. [[package]] name = "glotter2" -version = "0.10.3" +version = "0.11.0" description = "An execution library for scripts written in any language. This is a fork of https://github.com/auroq/glotter" optional = false -python-versions = "<4.0,>=3.9" +python-versions = ">=3.9,<4.0" groups = ["main"] files = [ - {file = "glotter2-0.10.3-py3-none-any.whl", hash = "sha256:3527feb0c7357fb944715851f20c802ae3b128cd35227cd4bdcee976f6e26d73"}, - {file = "glotter2-0.10.3.tar.gz", hash = "sha256:79f53023e27262edd942d9d3219c050bd893135490048fe218c60a4c71cc014d"}, + {file = "glotter2-0.11.0.tar.gz", hash = "sha256:1e4435d1813c7900a79b69db77aca9c2d610a7b401548b648a9e5ef378961fcb"}, ] [package.dependencies] @@ -298,6 +297,10 @@ pytest = ">=8.3.5,<9.0" pytest-xdist = ">=3.6.1,<4.0" pyyaml = ">6.0,<7.0" +[package.source] +type = "file" +url = "../../rzuckerm/glotter2/dist/glotter2-0.11.0.tar.gz" + [[package]] name = "idna" version = "3.10" @@ -838,4 +841,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.1" python-versions = ">=3.9,<4.0" -content-hash = "5fe2274417ca7444b987471c935831cab751f84c6b9a98744db3f5f0367cd068" +content-hash = "312bf4fe9bcafe1bbdeadbd5e47dee0f7d01c62678e7cb7c6bbf470dbb0ebe86" diff --git a/pyproject.toml b/pyproject.toml index 3604031ee..23ab45951 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ license = "MIT" dependencies = [ "ronbun (>=0.9.0,<0.10.0)", - "glotter2 (>=0.10.3,<0.11.0)" + "glotter2 @ file:///home/rzuckerm/git/rzuckerm/glotter2/dist/glotter2-0.11.0.tar.gz" ] # Initiator of the collection From a931d2fceeb03bdf07bc2f0e43c04f3ad2922640 Mon Sep 17 00:00:00 2001 From: rzuckerm Date: Fri, 11 Apr 2025 21:23:21 -0500 Subject: [PATCH 2/3] Only remove first CR-LF when no input parameters --- archive/c/commodore-basic/testinfo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archive/c/commodore-basic/testinfo.yml b/archive/c/commodore-basic/testinfo.yml index 325c64a55..11eb80668 100644 --- a/archive/c/commodore-basic/testinfo.yml +++ b/archive/c/commodore-basic/testinfo.yml @@ -11,7 +11,7 @@ container: echo "then"; \ echo " cbmbasic {{ source.name }}{{ source.extension }} | sed \"N;0s/^\\r\\n//\";"; \ echo "else"; \ - echo " printf \"%s\\n\" \"\$@\" | cbmbasic {{ source.name }}{{ source.extension }} | sed \"N;0s/^\\r\\n//\""; \ + echo " printf \"%s\\n\" \"\$@\" | cbmbasic {{ source.name }}{{ source.extension }}"; \ echo "fi" \ ) >{{ source.name }}' cmd: "sh ./{{ source.name }}" From 8bd6172c3549f917a7f2c77bdb9510cd31a99001 Mon Sep 17 00:00:00 2001 From: rzuckerm Date: Fri, 11 Apr 2025 21:32:48 -0500 Subject: [PATCH 3/3] Forgot to update glotter2 to published version --- poetry.lock | 13 +++++-------- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index af77304fc..ce57fd02b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -183,7 +183,7 @@ description = "Cross-platform colored terminal text." optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" groups = ["main"] -markers = "platform_system == \"Windows\" or sys_platform == \"win32\"" +markers = "sys_platform == \"win32\" or platform_system == \"Windows\"" files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, @@ -282,10 +282,11 @@ name = "glotter2" version = "0.11.0" description = "An execution library for scripts written in any language. This is a fork of https://github.com/auroq/glotter" optional = false -python-versions = ">=3.9,<4.0" +python-versions = "<4.0,>=3.9" groups = ["main"] files = [ - {file = "glotter2-0.11.0.tar.gz", hash = "sha256:1e4435d1813c7900a79b69db77aca9c2d610a7b401548b648a9e5ef378961fcb"}, + {file = "glotter2-0.11.0-py3-none-any.whl", hash = "sha256:56ee054bb3f7af4b40e5afd2508b7f39aaced6a0d73f29f14f3895fd78f061f9"}, + {file = "glotter2-0.11.0.tar.gz", hash = "sha256:fd58659e185fb6d4d0ab6394104d7228ca1b45e4e06f4c33732bac52a4dbd31f"}, ] [package.dependencies] @@ -297,10 +298,6 @@ pytest = ">=8.3.5,<9.0" pytest-xdist = ">=3.6.1,<4.0" pyyaml = ">6.0,<7.0" -[package.source] -type = "file" -url = "../../rzuckerm/glotter2/dist/glotter2-0.11.0.tar.gz" - [[package]] name = "idna" version = "3.10" @@ -841,4 +838,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.1" python-versions = ">=3.9,<4.0" -content-hash = "312bf4fe9bcafe1bbdeadbd5e47dee0f7d01c62678e7cb7c6bbf470dbb0ebe86" +content-hash = "edfa75fcc807b7f858a48de49a1dffe50dd3d1d8922c12286b07bf413460ae9c" diff --git a/pyproject.toml b/pyproject.toml index 23ab45951..5eb6774c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ license = "MIT" dependencies = [ "ronbun (>=0.9.0,<0.10.0)", - "glotter2 @ file:///home/rzuckerm/git/rzuckerm/glotter2/dist/glotter2-0.11.0.tar.gz" + "glotter2 (>=0.11.0,<0.12.0)" ] # Initiator of the collection