coco-tools 0.25__tar.gz → 0.26__tar.gz

{coco_tools-0.25/coco_tools.egg-info → coco_tools-0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coco-tools
-Version: 0.25
+Version: 0.26
 Summary: TRS-80 Color Computer Tools
 Author-email: Jamie Cho <jamieleecho@gmail.com>
 License-Expression: GPL-2.0
@@ -44,7 +44,7 @@ make install
 
 ### [decb-to-b09](https://github.com/jamieleecho/coco-tools/blob/main/README.decb-to-b09.md)
 
-```bash
+```text
 usage: decb-to-b09 [-h] [--version] [-l] [-z] [-s DEFAULT_STRING_STORAGE] [-D] [-w]
                    [-c CONFIG_FILE]
                    program.bas program.b09
@@ -76,7 +76,7 @@ optional arguments:
 
 ### cm3toppm
 
-```bash
+```text
 usage: cm3toppm [-h] [--version] [image.cm3] [image.ppm]
 
 Convert RS-DOS CM3 images to PPM
@@ -95,7 +95,7 @@ options:
 
 ### hrstoppm
 
-```bash
+```text
 usage: hrstoppm [-h] [-w width] [-r height] [-s bytes] [--version]
                 [image.hrs] [image.ppm]
 
@@ -118,7 +118,7 @@ options:
 
 ### maxtoppm
 
-```bash
+```text
 usage: maxtoppm [-h] [--version]
                 [-br | -rb | -br2 | -rb2 | -br3 | -rb3 | -s10 | -s11] [-i]
                 [-w width] [-r height] [-s bytes] [-newsroom]
@@ -163,7 +163,7 @@ Format and size options::
 
 ### mgetoppm
 
-```bash
+```text
 usage: mgetoppm [-h] [--version] [image.mge] [image.ppm]
 
 Convert RS-DOS MGE images to PPM
@@ -182,7 +182,7 @@ options:
 
 ### mge_viewer2
 
-```bash
+```text
 usage: mge_viewer2 [-h] [--version] [image.mge]
 
 View ColorMax 3 MGE files
@@ -199,7 +199,7 @@ optional arguments:
 
 ### pixtopgm
 
-```bash
+```text
 usage: pixtopgm [-h] [--version] image.pix [image.pgm]
 
 Convert RS-DOS PIX images to PGM
@@ -215,9 +215,63 @@ options:
   --version   show program's version number and exit
 ```
 
+### png-to-cocopng
+
+```text
+usage: png-to-coco-png [-h] [--bits-per-pixel BITS_PER_PIXEL] input_png input_palette output_png
+
+Convert a PNG image to a CoCo 3 palette PNG.
+
+positional arguments:
+  input_png             Path to the input PNG image file.
+  input_palette         Path to the input palette file is in the Multi Vue env.file format.
+  output_png            Path to the output PNG file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --bits-per-pixel BITS_PER_PIXEL
+                        Number of bits per pixel.
+```
+
+### png-to-mvicon
+
+```text
+usage: png-to-mvicon [-h] input_png input_palette output_icon
+
+Convert a 24x24 PNG image to a Multi Vue icon file.
+
+positional arguments:
+  input_png      Path to the input PNG image file.
+  input_palette  Path to the input palette file is in the Multi Vue env.file format.
+  output_icon    Path to the output icon file.
+
+optional arguments:
+  -h, --help     show this help message and exit
+```
+
+### png-to-os9-image
+
+```text
+usage: png-to-os9-image [-h] [--mask-index MASK_INDEX] [--bits-per-pixel BITS_PER_PIXEL]
+                        input_png input_palette output_os9_image
+
+Convert an PNG image to an OS-9 image.
+
+positional arguments:
+  input_png             Path to the input PNG image file.
+  input_palette         Path to the input palette file is in the Multi Vue env.file format.
+  output_os9_image      Path to the output OS-9 image file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --mask-index MASK_INDEX
+  --bits-per-pixel BITS_PER_PIXEL
+                        Number of bits per pixel.
+```
+
 ### rattoppm
 
-```bash
+```text
 usage: rattoppm [-h] [--version] [image.rat] [image.ppm]
 
 Convert RS-DOS RAT images to PPM
@@ -235,7 +289,7 @@ options:
 
 ### veftopng
 
-```bash
+```text
 usage: veftopng [-h] [--version] image.vef image.png
 
 Convert OS-9 VEF images to PNG

{coco_tools-0.25 → coco_tools-0.26}/README.md

@@ -20,7 +20,7 @@ make install
 
 ### [decb-to-b09](https://github.com/jamieleecho/coco-tools/blob/main/README.decb-to-b09.md)
 
-```bash
+```text
 usage: decb-to-b09 [-h] [--version] [-l] [-z] [-s DEFAULT_STRING_STORAGE] [-D] [-w]
                    [-c CONFIG_FILE]
                    program.bas program.b09
@@ -52,7 +52,7 @@ optional arguments:
 
 ### cm3toppm
 
-```bash
+```text
 usage: cm3toppm [-h] [--version] [image.cm3] [image.ppm]
 
 Convert RS-DOS CM3 images to PPM
@@ -71,7 +71,7 @@ options:
 
 ### hrstoppm
 
-```bash
+```text
 usage: hrstoppm [-h] [-w width] [-r height] [-s bytes] [--version]
                 [image.hrs] [image.ppm]
 
@@ -94,7 +94,7 @@ options:
 
 ### maxtoppm
 
-```bash
+```text
 usage: maxtoppm [-h] [--version]
                 [-br | -rb | -br2 | -rb2 | -br3 | -rb3 | -s10 | -s11] [-i]
                 [-w width] [-r height] [-s bytes] [-newsroom]
@@ -139,7 +139,7 @@ Format and size options::
 
 ### mgetoppm
 
-```bash
+```text
 usage: mgetoppm [-h] [--version] [image.mge] [image.ppm]
 
 Convert RS-DOS MGE images to PPM
@@ -158,7 +158,7 @@ options:
 
 ### mge_viewer2
 
-```bash
+```text
 usage: mge_viewer2 [-h] [--version] [image.mge]
 
 View ColorMax 3 MGE files
@@ -175,7 +175,7 @@ optional arguments:
 
 ### pixtopgm
 
-```bash
+```text
 usage: pixtopgm [-h] [--version] image.pix [image.pgm]
 
 Convert RS-DOS PIX images to PGM
@@ -191,9 +191,63 @@ options:
   --version   show program's version number and exit
 ```
 
+### png-to-cocopng
+
+```text
+usage: png-to-coco-png [-h] [--bits-per-pixel BITS_PER_PIXEL] input_png input_palette output_png
+
+Convert a PNG image to a CoCo 3 palette PNG.
+
+positional arguments:
+  input_png             Path to the input PNG image file.
+  input_palette         Path to the input palette file is in the Multi Vue env.file format.
+  output_png            Path to the output PNG file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --bits-per-pixel BITS_PER_PIXEL
+                        Number of bits per pixel.
+```
+
+### png-to-mvicon
+
+```text
+usage: png-to-mvicon [-h] input_png input_palette output_icon
+
+Convert a 24x24 PNG image to a Multi Vue icon file.
+
+positional arguments:
+  input_png      Path to the input PNG image file.
+  input_palette  Path to the input palette file is in the Multi Vue env.file format.
+  output_icon    Path to the output icon file.
+
+optional arguments:
+  -h, --help     show this help message and exit
+```
+
+### png-to-os9-image
+
+```text
+usage: png-to-os9-image [-h] [--mask-index MASK_INDEX] [--bits-per-pixel BITS_PER_PIXEL]
+                        input_png input_palette output_os9_image
+
+Convert an PNG image to an OS-9 image.
+
+positional arguments:
+  input_png             Path to the input PNG image file.
+  input_palette         Path to the input palette file is in the Multi Vue env.file format.
+  output_os9_image      Path to the output OS-9 image file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --mask-index MASK_INDEX
+  --bits-per-pixel BITS_PER_PIXEL
+                        Number of bits per pixel.
+```
+
 ### rattoppm
 
-```bash
+```text
 usage: rattoppm [-h] [--version] [image.rat] [image.ppm]
 
 Convert RS-DOS RAT images to PPM
@@ -211,7 +265,7 @@ options:
 
 ### veftopng
 
-```bash
+```text
 usage: veftopng [-h] [--version] image.vef image.png
 
 Convert OS-9 VEF images to PNG

{coco_tools-0.25 → coco_tools-0.26}/coco/__init__.py

@@ -1,2 +1,2 @@
 # __version__ MUST be defined on line 2
-__version__ = "0.25"
+__version__ = "0.26"

{coco_tools-0.25 → coco_tools-0.26}/coco/b09/procbank.py

@@ -1,4 +1,4 @@
-import importlib.resources as pkg_resources
+import importlib.resources as importlib_resources
 import re
 from collections import defaultdict
 from typing import Dict, Set
@@ -42,7 +42,7 @@ class ProcedureBank(object):
         Loads the BASIC09 file and stores the procedures and determines the
         dependencies.
         """
-        resource_file = pkg_resources.files(resources) / resource_name
+        resource_file = importlib_resources.files(resources) / resource_name
         with resource_file.open("r") as f:
             return self.add_from_str(f.read())
 

{coco_tools-0.25 → coco_tools-0.26/coco_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coco-tools
-Version: 0.25
+Version: 0.26
 Summary: TRS-80 Color Computer Tools
 Author-email: Jamie Cho <jamieleecho@gmail.com>
 License-Expression: GPL-2.0
@@ -44,7 +44,7 @@ make install
 
 ### [decb-to-b09](https://github.com/jamieleecho/coco-tools/blob/main/README.decb-to-b09.md)
 
-```bash
+```text
 usage: decb-to-b09 [-h] [--version] [-l] [-z] [-s DEFAULT_STRING_STORAGE] [-D] [-w]
                    [-c CONFIG_FILE]
                    program.bas program.b09
@@ -76,7 +76,7 @@ optional arguments:
 
 ### cm3toppm
 
-```bash
+```text
 usage: cm3toppm [-h] [--version] [image.cm3] [image.ppm]
 
 Convert RS-DOS CM3 images to PPM
@@ -95,7 +95,7 @@ options:
 
 ### hrstoppm
 
-```bash
+```text
 usage: hrstoppm [-h] [-w width] [-r height] [-s bytes] [--version]
                 [image.hrs] [image.ppm]
 
@@ -118,7 +118,7 @@ options:
 
 ### maxtoppm
 
-```bash
+```text
 usage: maxtoppm [-h] [--version]
                 [-br | -rb | -br2 | -rb2 | -br3 | -rb3 | -s10 | -s11] [-i]
                 [-w width] [-r height] [-s bytes] [-newsroom]
@@ -163,7 +163,7 @@ Format and size options::
 
 ### mgetoppm
 
-```bash
+```text
 usage: mgetoppm [-h] [--version] [image.mge] [image.ppm]
 
 Convert RS-DOS MGE images to PPM
@@ -182,7 +182,7 @@ options:
 
 ### mge_viewer2
 
-```bash
+```text
 usage: mge_viewer2 [-h] [--version] [image.mge]
 
 View ColorMax 3 MGE files
@@ -199,7 +199,7 @@ optional arguments:
 
 ### pixtopgm
 
-```bash
+```text
 usage: pixtopgm [-h] [--version] image.pix [image.pgm]
 
 Convert RS-DOS PIX images to PGM
@@ -215,9 +215,63 @@ options:
   --version   show program's version number and exit
 ```
 
+### png-to-cocopng
+
+```text
+usage: png-to-coco-png [-h] [--bits-per-pixel BITS_PER_PIXEL] input_png input_palette output_png
+
+Convert a PNG image to a CoCo 3 palette PNG.
+
+positional arguments:
+  input_png             Path to the input PNG image file.
+  input_palette         Path to the input palette file is in the Multi Vue env.file format.
+  output_png            Path to the output PNG file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --bits-per-pixel BITS_PER_PIXEL
+                        Number of bits per pixel.
+```
+
+### png-to-mvicon
+
+```text
+usage: png-to-mvicon [-h] input_png input_palette output_icon
+
+Convert a 24x24 PNG image to a Multi Vue icon file.
+
+positional arguments:
+  input_png      Path to the input PNG image file.
+  input_palette  Path to the input palette file is in the Multi Vue env.file format.
+  output_icon    Path to the output icon file.
+
+optional arguments:
+  -h, --help     show this help message and exit
+```
+
+### png-to-os9-image
+
+```text
+usage: png-to-os9-image [-h] [--mask-index MASK_INDEX] [--bits-per-pixel BITS_PER_PIXEL]
+                        input_png input_palette output_os9_image
+
+Convert an PNG image to an OS-9 image.
+
+positional arguments:
+  input_png             Path to the input PNG image file.
+  input_palette         Path to the input palette file is in the Multi Vue env.file format.
+  output_os9_image      Path to the output OS-9 image file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --mask-index MASK_INDEX
+  --bits-per-pixel BITS_PER_PIXEL
+                        Number of bits per pixel.
+```
+
 ### rattoppm
 
-```bash
+```text
 usage: rattoppm [-h] [--version] [image.rat] [image.ppm]
 
 Convert RS-DOS RAT images to PPM
@@ -235,7 +289,7 @@ options:
 
 ### veftopng
 
-```bash
+```text
 usage: veftopng [-h] [--version] image.vef image.png
 
 Convert OS-9 VEF images to PNG

{coco_tools-0.25 → coco_tools-0.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coco-tools"
-version = "0.25"
+version = "0.26"
 authors = [
   {name = "Jamie Cho", email = "jamieleecho@gmail.com"},
 ]
@@ -38,8 +38,8 @@ maxtoppm = "coco.maxtoppm:main"
 mgetoppm = "coco.mgetoppm:main"
 mge_viewer2 = "coco.mge_viewer2:main"
 pixtopgm = "coco.pixtopgm:main"
-png-to-mvicon = "coco.png_utilities:png_to_mvicon"
 png-to-coco-png = "coco.png_utilities:png_to_coco_png"
+png-to-mvicon = "coco.png_utilities:png_to_mvicon"
 png-to-os9-image = "coco.png_utilities:png_to_os9_image"
 rattoppm = "coco.rattoppm:main"
 veftopng = "coco.veftopng:main"

{coco_tools-0.25 → coco_tools-0.26}/tests/coco_tests/b09/test_visitors.py

@@ -1,6 +1,6 @@
+import importlib.resources as importlib_resources
 from typing import List
 
-import pkg_resources
 import pytest
 
 from coco import b09
@@ -20,16 +20,18 @@ from coco.b09.visitors import (
 
 
 def parse_program(resource_name: str) -> BasicProg:
-    path = pkg_resources.resource_filename(__name__, f"fixtures/{resource_name}")
-    prog: str
-    with open(path) as f:
-        prog = f.read()
-
-    tree = grammar.parse(prog)
-    bv = BasicVisitor()
-    prog: BasicProg = bv.visit(tree)
-    prog.visit(BasicFunctionalExpressionPatcherVisitor())
-    return prog
+    with importlib_resources.as_file(
+        importlib_resources.files(__package__) / f"fixtures/{resource_name}"
+    ) as path:
+        prog: str
+        with open(path) as f:
+            prog = f.read()
+
+        tree = grammar.parse(prog)
+        bv = BasicVisitor()
+        prog: BasicProg = bv.visit(tree)
+        prog.visit(BasicFunctionalExpressionPatcherVisitor())
+        return prog
 
 
 @pytest.fixture