coco-tools 0.19__tar.gz → 0.20__tar.gz

{coco-tools-0.19/coco_tools.egg-info → coco_tools-0.20}/PKG-INFO

@@ -1,20 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: coco-tools
-Version: 0.19
+Version: 0.20
 Summary: TRS-80 Color Computer Tools
-Home-page: https://github.com/jamieleecho/coco-tools
-Author: Jamie Cho
-Author-email: jamieleecho+coco_tools@gmail.com
-License: GPLv2
-Keywords: coco image conversion trs-80 tandy
+Author-email: Jamie Cho <jamieleecho@gmail.com>
+License-Expression: GPL-2.0
+Project-URL: Repository, https://github.com/jamieleecho/coco-tools
+Project-URL: Issues, https://github.com/jamieleecho/coco-tools/issues
+Keywords: coco,image,conversion,trs-80,tandy
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Build Tools
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9.19
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: parsimonious>=0.10.0
+Requires-Dist: Pillow>=7.0.0
+Requires-Dist: pypng>=0.0.18
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pydantic-yaml>=1.3.0
+Dynamic: license-file
 
 # coco-tools
 
@@ -30,9 +35,31 @@ pip install coco-tools
 # To install from source
 git clone https://github.com/jamieleecho/coco-tools.git
 cd coco-tools
-python3 setup.py
+make install-pre-commit
+make install
 ```
 
+The `Makefile` makes it easy to perform the most common operations:
+* `make all` transpiles several exapmle ECB programs to Basic09
+* `make check-all` runs linting and `uv.lock` checks
+* `make check-lint` checks for linting issues
+* `make check-lock` verifies the `uv.lock` is aligned to `pyproject.toml`
+* `make clean` cleans the virtual environment and caches
+* `make default` runs a default set of checks on the code
+* `make fix-all` formats the code, fixes lint errors and runs locks `uv.lock` to `pyproject.toml`
+* `make fix-format` formats the code
+* `make fix-lint` fixes linting issues
+* `make fix-lint-unsafe` fixes linting issues potentially adding inadvertant bugs
+* `make help` outputs the different make options
+* `make install` build install the distribution
+* `make install-pre-commit` installs pre-commit hooks
+* `make lock` locks `uv.lock` to `pyproject.toml`
+* `make install-pre-commit` installs pre-commit hooks
+* `make run-tests` runs the unit tests
+* `make sync` syncs the python environment with `uv.lock`
+
+`.vscode/settings.json` is set so that unit tests can be run without further configuration.
+
 ## Tools
 
 ### [decb-to-b09](./README.decb-to-b09.md)
@@ -248,18 +275,38 @@ options:
 ## Developing and Testing
 
 ```
+# To set up pre-commit checks
+pre-commit install
+
 # Build the docker image
-docker-compose build test
+docker compose build test
 
 # Run tests using the source on the docker image
-docker-compose run test
+docker compose run test
 
 # Run tests using the source on the host computer
-docker-compose run testv
+docker compose run testv
 
-# To make changes and develop locally
+# To develop locally
 pip install -r requirements.txt
-pre-commit install
+
+# Run linting, build example disk images for basic conversion
+make
+
+# Remove built artifacts
+make clean
+
+# Reformats the code
+make format
+
+# Only runs linting
+make lint
+
+# Only run tests
+make test
+
+# Build basic and os-9 eample images
+make basic.dsk os9boot.dsk
 ```
 
 ## Credits

coco-tools-0.19/PKG-INFO → coco_tools-0.20/README.md

@@ -1,21 +1,3 @@
-Metadata-Version: 2.1
-Name: coco-tools
-Version: 0.19
-Summary: TRS-80 Color Computer Tools
-Home-page: https://github.com/jamieleecho/coco-tools
-Author: Jamie Cho
-Author-email: jamieleecho+coco_tools@gmail.com
-License: GPLv2
-Keywords: coco image conversion trs-80 tandy
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9.19
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
 # coco-tools
 
 This is a simple collection of tools to assist with developing software for
@@ -30,9 +12,31 @@ pip install coco-tools
 # To install from source
 git clone https://github.com/jamieleecho/coco-tools.git
 cd coco-tools
-python3 setup.py
+make install-pre-commit
+make install
 ```
 
+The `Makefile` makes it easy to perform the most common operations:
+* `make all` transpiles several exapmle ECB programs to Basic09
+* `make check-all` runs linting and `uv.lock` checks
+* `make check-lint` checks for linting issues
+* `make check-lock` verifies the `uv.lock` is aligned to `pyproject.toml`
+* `make clean` cleans the virtual environment and caches
+* `make default` runs a default set of checks on the code
+* `make fix-all` formats the code, fixes lint errors and runs locks `uv.lock` to `pyproject.toml`
+* `make fix-format` formats the code
+* `make fix-lint` fixes linting issues
+* `make fix-lint-unsafe` fixes linting issues potentially adding inadvertant bugs
+* `make help` outputs the different make options
+* `make install` build install the distribution
+* `make install-pre-commit` installs pre-commit hooks
+* `make lock` locks `uv.lock` to `pyproject.toml`
+* `make install-pre-commit` installs pre-commit hooks
+* `make run-tests` runs the unit tests
+* `make sync` syncs the python environment with `uv.lock`
+
+`.vscode/settings.json` is set so that unit tests can be run without further configuration.
+
 ## Tools
 
 ### [decb-to-b09](./README.decb-to-b09.md)
@@ -248,18 +252,38 @@ options:
 ## Developing and Testing
 
 ```
+# To set up pre-commit checks
+pre-commit install
+
 # Build the docker image
-docker-compose build test
+docker compose build test
 
 # Run tests using the source on the docker image
-docker-compose run test
+docker compose run test
 
 # Run tests using the source on the host computer
-docker-compose run testv
+docker compose run testv
 
-# To make changes and develop locally
+# To develop locally
 pip install -r requirements.txt
-pre-commit install
+
+# Run linting, build example disk images for basic conversion
+make
+
+# Remove built artifacts
+make clean
+
+# Reformats the code
+make format
+
+# Only runs linting
+make lint
+
+# Only run tests
+make test
+
+# Build basic and os-9 eample images
+make basic.dsk os9boot.dsk
 ```
 
 ## Credits

{coco-tools-0.19 → coco_tools-0.20}/coco/__init__.py

@@ -1,2 +1,2 @@
 # __version__ MUST be defined on line 2
-__version__ = "0.19"
+__version__ = "0.20"

{coco-tools-0.19 → coco_tools-0.20}/coco/b09/elements.py

@@ -493,7 +493,7 @@ class BasicLine(AbstractBasicConstruct):
 
     def basic09_text(self, indent_level) -> str:
         if self._is_referenced and self._num is not None:
-            return f"{self._num} " f"{self._statements.basic09_text(indent_level)}"
+            return f"{self._num} {self._statements.basic09_text(indent_level)}"
         return f"{self._statements.basic09_text(indent_level)}"
 
     def visit(self, visitor: "BasicConstructVisitor") -> None:
@@ -827,7 +827,7 @@ class BasicFunctionCall(AbstractBasicExpression):
         self._args = args
 
     def basic09_text(self, indent_level: int) -> str:
-        return f"{self._func}" f"{self._args.basic09_text(indent_level)}"
+        return f"{self._func}{self._args.basic09_text(indent_level)}"
 
 
 class BasicDataStatement(AbstractBasicStatement):

{coco-tools-0.19 → coco_tools-0.20}/coco/b09/grammar.py

@@ -133,7 +133,7 @@ KEYWORDS = "|".join(
             "GOSUB",
             "GOTO",
             "HBUFF",
-            "HGET" "HCIRCLE",
+            "HGETHCIRCLE",
             "HCLS",
             "HCOLOR",
             "HEX$",
@@ -299,8 +299,8 @@ grammar = Grammar(
                     / hget_statement
                     / hput_statement
                     / hpaint_statement
-    statement2      = ({ ' / '.join(QUOTED_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space* ")" space*
-    statement3      = ({ ' / '.join(QUOTED_STATEMENTS3_NAMES)}) space* "(" space* exp space* "," space* exp space* "," space* exp space* ")" space*
+    statement2      = ({" / ".join(QUOTED_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space* ")" space*
+    statement3      = ({" / ".join(QUOTED_STATEMENTS3_NAMES)}) space* "(" space* exp space* "," space* exp space* "," space* exp space* ")" space*
     statements           = statement? space* statements_elements space* last_statement?
     last_statement  = comment / partial_str_arr_assign / partial_str_assign
     partial_str_arr_assign = "LET"? space* str_array_ref_exp space* "=" space* partial_str_lit
@@ -342,8 +342,8 @@ grammar = Grammar(
     num_power_exp        = val_exp space* num_power_sub_exps
     num_power_sub_exps   = num_power_sub_exp*
     num_power_sub_exp    = ("^" space* val_exp space*)
-    func_exp        = ({ ' / '.join(QUOTED_FUNCTION_NAMES)}) space* "(" space* exp space* ")" space*
-    func_str_exp    = ({ ' / '.join(QUOTED_STR_NUM_FUNCTIONS_NAMES)}) space* "(" space* str_exp space* ")" space*
+    func_exp        = ({" / ".join(QUOTED_FUNCTION_NAMES)}) space* "(" space* exp space* ")" space*
+    func_str_exp    = ({" / ".join(QUOTED_STR_NUM_FUNCTIONS_NAMES)}) space* "(" space* str_exp space* ")" space*
     val_exp         = num_literal
                     / hex_literal
                     / paren_exp
@@ -363,11 +363,11 @@ grammar = Grammar(
     str_exp          = str_simple_exp space* str_exp_elements
     str_exp_elements = str_exp_element*
     str_exp_element  = "+" space* str_simple_exp space*
-    str2_func_exp    = ({ ' / '.join(QUOTED_STR2_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* ")" space*
-    str3_func_exp    = ({ ' / '.join(QUOTED_STR3_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* "," space* exp space* ")" space*
-    num_str_func_exp = ({ ' / '.join(QUOTED_NUM_STR_FUNCTIONS_NAMES)}) space* "(" space* exp space* ")" space*
-    num_str_func_exp_statements = ({ ' / '.join(QUOTED_NUM_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
-    str_func_exp_statements = ({ ' / '.join(QUOTED_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space*
+    str2_func_exp    = ({" / ".join(QUOTED_STR2_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* ")" space*
+    str3_func_exp    = ({" / ".join(QUOTED_STR3_FUNCTION_NAMES)}) space* "(" space* str_exp space* "," space* exp space* "," space* exp space* ")" space*
+    num_str_func_exp = ({" / ".join(QUOTED_NUM_STR_FUNCTIONS_NAMES)}) space* "(" space* exp space* ")" space*
+    num_str_func_exp_statements = ({" / ".join(QUOTED_NUM_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
+    str_func_exp_statements = ({" / ".join(QUOTED_STR_FUNCTIONS_TO_STATEMENTS_NAMES)}) space*
     str_simple_exp   = str_literal
                      / str2_func_exp
                      / str3_func_exp
@@ -413,7 +413,7 @@ grammar = Grammar(
     linenum_list        = linenum space* linenum_list0
     linenum_list0       = linenum_list_elem*
     linenum_list_elem   = "," space* linenum space*
-    functions           = ~r"{'|'.join(FUNCTIONS.keys())}"
+    functions           = ~r"{"|".join(FUNCTIONS.keys())}"
     data_statement      = "DATA" space* data_elements space*
     data_elements       = data_element space* data_elements0
     data_element        = data_num_element / data_str_element
@@ -425,7 +425,7 @@ grammar = Grammar(
     data_str_element0   = space* str_literal space*
     data_str_element1   = space* data_str_literal
     data_str_literal    = ~r'[^",:\n]*'
-    single_kw_statement = ({ ' / '.join(QUOTED_SINGLE_KEYWORD_STATEMENTS)}) space*
+    single_kw_statement = ({" / ".join(QUOTED_SINGLE_KEYWORD_STATEMENTS)}) space*
     for_statement       = "FOR" space* var space* "=" space* exp space* "TO" space* exp space*
     for_step_statement  = "FOR" space* var space* "=" space* exp space* "TO" space* exp space* "STEP" space* exp space*
     next_statement      = next_var_statement / next_empty_statement
@@ -434,8 +434,8 @@ grammar = Grammar(
     var_list            = var space* var_list_elements
     var_list_elements   = var_list_element*
     var_list_element    = "," space* var space*
-    func_to_statements  = ({ ' / '.join(QUOTED_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
-    func_to_statements2 = ({ ' / '.join(QUOTED_FUNCTIONS_TO_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space*")" space*
+    func_to_statements  = ({" / ".join(QUOTED_FUNCTIONS_TO_STATEMENTS_NAMES)}) space* "(" space* exp space* ")" space*
+    func_to_statements2 = ({" / ".join(QUOTED_FUNCTIONS_TO_STATEMENTS2_NAMES)}) space* "(" space* exp space* "," space* exp space*")" space*
     joystk_to_statement = "JOYSTK" space* "(" space* exp space* ")" space*
     dim_element0        = (int_literal / int_hex_literal)
     dim_var             = (dim_array_var / str_var / var)

{coco-tools-0.19 → coco_tools-0.20}/coco/b09/parser.py

@@ -866,7 +866,7 @@ class BasicVisitor(NodeVisitor):
         return BasicDimStatement(dim_var_list)
 
     def visit_clear_statement(self, node, visited_children) -> AbstractBasicStatement:
-        return BasicComment(f" {node.text.strip() }")
+        return BasicComment(f" {node.text.strip()}")
 
     def visit_read_statement(self, _, visited_children) -> AbstractBasicStatement:
         _, _, rhs, _, rhs_list = visited_children

{coco-tools-0.19 → coco_tools-0.20}/coco/maxtoppm.py

@@ -184,7 +184,7 @@ Copyright (c) 2018 by Mathieu Bouchard
 Copyright (c) 2018-2020 by Mathieu Bouchard, Jamie Cho
 Version: {}""".format(__version__)
 PIXEL_MODE_DESCRIPTION = (
-    "Default pixel mode is no artifact (PMODE 4 on " "monitor). The 6 other modes:"
+    "Default pixel mode is no artifact (PMODE 4 on monitor). The 6 other modes:"
 )
 PARSER_MODE_DESCRIPTION = """Default file format is CocoMax 1/2's .MAX, which is also Graphicom's
     .PIC and SAVEM of 4 or 8 pages of PMODE 3/4.

coco-tools-0.19/README.md → coco_tools-0.20/coco_tools.egg-info/PKG-INFO

@@ -1,3 +1,26 @@
+Metadata-Version: 2.4
+Name: coco-tools
+Version: 0.20
+Summary: TRS-80 Color Computer Tools
+Author-email: Jamie Cho <jamieleecho@gmail.com>
+License-Expression: GPL-2.0
+Project-URL: Repository, https://github.com/jamieleecho/coco-tools
+Project-URL: Issues, https://github.com/jamieleecho/coco-tools/issues
+Keywords: coco,image,conversion,trs-80,tandy
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: Software Development :: Build Tools
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9.19
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: parsimonious>=0.10.0
+Requires-Dist: Pillow>=7.0.0
+Requires-Dist: pypng>=0.0.18
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pydantic-yaml>=1.3.0
+Dynamic: license-file
+
 # coco-tools
 
 This is a simple collection of tools to assist with developing software for
@@ -12,9 +35,31 @@ pip install coco-tools
 # To install from source
 git clone https://github.com/jamieleecho/coco-tools.git
 cd coco-tools
-python3 setup.py
+make install-pre-commit
+make install
 ```
 
+The `Makefile` makes it easy to perform the most common operations:
+* `make all` transpiles several exapmle ECB programs to Basic09
+* `make check-all` runs linting and `uv.lock` checks
+* `make check-lint` checks for linting issues
+* `make check-lock` verifies the `uv.lock` is aligned to `pyproject.toml`
+* `make clean` cleans the virtual environment and caches
+* `make default` runs a default set of checks on the code
+* `make fix-all` formats the code, fixes lint errors and runs locks `uv.lock` to `pyproject.toml`
+* `make fix-format` formats the code
+* `make fix-lint` fixes linting issues
+* `make fix-lint-unsafe` fixes linting issues potentially adding inadvertant bugs
+* `make help` outputs the different make options
+* `make install` build install the distribution
+* `make install-pre-commit` installs pre-commit hooks
+* `make lock` locks `uv.lock` to `pyproject.toml`
+* `make install-pre-commit` installs pre-commit hooks
+* `make run-tests` runs the unit tests
+* `make sync` syncs the python environment with `uv.lock`
+
+`.vscode/settings.json` is set so that unit tests can be run without further configuration.
+
 ## Tools
 
 ### [decb-to-b09](./README.decb-to-b09.md)
@@ -230,18 +275,38 @@ options:
 ## Developing and Testing
 
 ```
+# To set up pre-commit checks
+pre-commit install
+
 # Build the docker image
-docker-compose build test
+docker compose build test
 
 # Run tests using the source on the docker image
-docker-compose run test
+docker compose run test
 
 # Run tests using the source on the host computer
-docker-compose run testv
+docker compose run testv
 
-# To make changes and develop locally
+# To develop locally
 pip install -r requirements.txt
-pre-commit install
+
+# Run linting, build example disk images for basic conversion
+make
+
+# Remove built artifacts
+make clean
+
+# Reformats the code
+make format
+
+# Only runs linting
+make lint
+
+# Only run tests
+make test
+
+# Build basic and os-9 eample images
+make basic.dsk os9boot.dsk
 ```
 
 ## Credits

coco_tools-0.20/coco_tools.egg-info/SOURCES.txt

@@ -0,0 +1,67 @@
+LICENSE
+README.md
+pyproject.toml
+./coco/__init__.py
+./coco/cm3toppm.py
+./coco/decb_to_b09.py
+./coco/hrstoppm.py
+./coco/maxtoppm.py
+./coco/mge_viewer2.py
+./coco/mgetoppm.py
+./coco/pixtopgm.py
+./coco/rattoppm.py
+./coco/util.py
+./coco/veftopng.py
+./coco/b09/__init__.py
+./coco/b09/compiler.py
+./coco/b09/configs.py
+./coco/b09/elements.py
+./coco/b09/error_handler.py
+./coco/b09/grammar.py
+./coco/b09/parser.py
+./coco/b09/procbank.py
+./coco/b09/prog.py
+./coco/b09/visitors.py
+./coco/resources/__init__.py
+./coco/resources/ecb.b09
+./tests/test_error_handler.py
+./tests/coco_tests/b09/__init__.py
+./tests/coco_tests/b09/test_b09.py
+./tests/coco_tests/b09/test_configs.py
+./tests/coco_tests/b09/test_visitors.py
+./tests/coco_tests/fixtures/__init__.py
+coco/__init__.py
+coco/cm3toppm.py
+coco/decb_to_b09.py
+coco/hrstoppm.py
+coco/maxtoppm.py
+coco/mge_viewer2.py
+coco/mgetoppm.py
+coco/pixtopgm.py
+coco/rattoppm.py
+coco/util.py
+coco/veftopng.py
+coco/b09/__init__.py
+coco/b09/compiler.py
+coco/b09/configs.py
+coco/b09/elements.py
+coco/b09/error_handler.py
+coco/b09/grammar.py
+coco/b09/parser.py
+coco/b09/procbank.py
+coco/b09/prog.py
+coco/b09/visitors.py
+coco/resources/__init__.py
+coco/resources/ecb.b09
+coco_tools.egg-info/PKG-INFO
+coco_tools.egg-info/SOURCES.txt
+coco_tools.egg-info/dependency_links.txt
+coco_tools.egg-info/entry_points.txt
+coco_tools.egg-info/requires.txt
+coco_tools.egg-info/top_level.txt
+tests/test_error_handler.py
+tests/coco_tests/b09/__init__.py
+tests/coco_tests/b09/test_b09.py
+tests/coco_tests/b09/test_configs.py
+tests/coco_tests/b09/test_visitors.py
+tests/coco_tests/fixtures/__init__.py

coco_tools-0.20/coco_tools.egg-info/top_level.txt

@@ -0,0 +1,5 @@
+coco
+dist
+examples
+playground
+tests

coco_tools-0.20/pyproject.toml

@@ -0,0 +1,87 @@
+[project]
+name = "coco-tools"
+version = "0.20"
+authors = [
+  {name = "Jamie Cho", email = "jamieleecho@gmail.com"},
+]
+description = "TRS-80 Color Computer Tools"
+readme = "README.md"
+classifiers=[
+  "Development Status :: 3 - Alpha",
+  "Intended Audience :: Developers",
+  "Topic :: Software Development :: Build Tools",
+  "Programming Language :: Python :: 3",
+]
+license = "GPL-2.0"
+keywords = [
+  "coco",
+  "image",
+  "conversion",
+  "trs-80",
+  "tandy",
+]
+requires-python = ">=3.9.19"
+dependencies = [
+  "parsimonious>=0.10.0",
+  "Pillow>=7.0.0",
+  "pypng>=0.0.18",
+  "pydantic>=2.0.0",
+  "pydantic-yaml>=1.3.0",
+]
+
+[project.scripts  ]
+  decb-to-b09 = "coco.decb_to_b09:main"
+  cm3toppm = "coco.cm3toppm:main"
+  hrstoppm = "coco.hrstoppm:main"
+  maxtoppm = "coco.maxtoppm:main"
+  mgetoppm = "coco.mgetoppm:main"
+  mge_viewer2 = "coco.mge_viewer2:main"
+  pixtopgm = "coco.pixtopgm:main"
+  rattoppm = "coco.rattoppm:main"
+  veftopng = "coco.veftopng:main"
+
+[project.urls]
+Repository = "https://github.com/jamieleecho/coco-tools"
+Issues = "https://github.com/jamieleecho/coco-tools/issues"
+
+[dependency-groups]
+dev = [
+  "coverage",
+  "imagehash",
+  "pytest",
+  "pre-commit",
+  "ruff",
+  "types-setuptools",
+]
+
+[build-system]
+requires = [
+  "setuptools",
+  "scipy",
+  "wheel",
+]
+
+[tool.setuptools.packages.find]
+where = ["."]
+exclude = ["tests.coco_tests"]
+
+[tool.setuptools.package-dir]
+"" = "."
+
+[tool.setuptools.package-data]
+"coco.resources" = ["*.b09"]
+
+[tool.pytest.ini_options]
+rootdir = "."
+pythonpath = [
+  ".",
+]
+markers = [
+  "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+  "quick: marks tests as fast",
+]
+
+[tool.ruff]
+exclude = [
+  "docs/",
+]