tinyprint 0.2.4__tar.gz → 0.3.0__tar.gz

tinyprint-0.3.0/.gitignore

@@ -0,0 +1,134 @@
+# ide / editor config files
+.vscode
+.idea
+.vim
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/

tinyprint-0.3.0/.woodpecker/test.yaml

@@ -0,0 +1,32 @@
+when:
+  - event: push
+    branch: main
+
+steps:
+  - name: test and coverage
+    image: python:${TAG}
+    commands:
+      # Install poppler for pdf print support
+      # Use xvfb to simulate X display for GUI tests
+      - apt-get update && apt-get install -y poppler-utils xvfb
+      - pip install virtualenv
+      - virtualenv .tenv
+      - .tenv/bin/pip install coverage
+      - .tenv/bin/pip install .[dev]
+      - .tenv/bin/mypy -p tinyprint
+      - mkdir t/
+      - cd t/
+      - xvfb-run -a -s "-screen 0 1024x768x24" ../.tenv/bin/coverage run -m pytest ../.
+      # This makes sure the next step can upload the report.
+      - echo "# Python ${TAG} coverage report\n\n" > coverage-${TAG}.md
+      - ../.tenv/bin/coverage report --format=markdown >> coverage-${TAG}.md
+    when:
+      - event: push
+        branch: main
+
+matrix:
+  TAG:
+    - 3.10
+    - 3.11
+    - 3.12
+    - 3.13

{tinyprint-0.2.4 → tinyprint-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: tinyprint
-Version: 0.2.4
+Version: 0.3.0
 Summary: ui & cli to print zines with esc/pos printer
 Author-email: Levin Eric Zimmermann <levin.eric.zimmermann@posteo.com>
 License: GPL
@@ -9,8 +9,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: python-escpos[serial,usb]>=3.1
 Requires-Dist: dataclasses-json>=0.6.0
-Requires-Dist: marko>=2.1.2
+Requires-Dist: marko==2.1.2
 Requires-Dist: pdf2image>=1.17.0
+Requires-Dist: platformdirs>=4.5.0
 Provides-Extra: dev
 Requires-Dist: coverage; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -18,7 +19,6 @@ Requires-Dist: syrupy; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: types-six; extra == "dev"
 Requires-Dist: types-pillow; extra == "dev"
-Dynamic: license-file
 
 # tinyprint
 
@@ -34,13 +34,14 @@ Open a console and type:
 
 ```bash
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)
+brew install poppler
 brew install python
 brew install python-tk
 brew install pipx
 pipx install tinyprint
 ```
 
-## Linux
+### Linux
 
 Install python, and then just use pip:
 
@@ -48,6 +49,22 @@ Install python, and then just use pip:
 pip3 install tinyprint
 ```
 
-## Windows
+If you want to print PDFs, you also need to install `poppler` (specific name of the package depends on the distro, but usually it's called something like `poppler-utils`).
+
+### Windows
 
 I don't know, but if someone manages, please let us know.
+
+---
+
+## Running tests
+
+```bash
+python -m pytest
+```
+
+Recreate snapshot files:
+
+```bash
+python -m pytest --snapshot-update
+```

{tinyprint-0.2.4 → tinyprint-0.3.0}/README.md

@@ -12,13 +12,14 @@ Open a console and type:
 
 ```bash
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)
+brew install poppler
 brew install python
 brew install python-tk
 brew install pipx
 pipx install tinyprint
 ```
 
-## Linux
+### Linux
 
 Install python, and then just use pip:
 
@@ -26,6 +27,22 @@ Install python, and then just use pip:
 pip3 install tinyprint
 ```
 
-## Windows
+If you want to print PDFs, you also need to install `poppler` (specific name of the package depends on the distro, but usually it's called something like `poppler-utils`).
+
+### Windows
 
 I don't know, but if someone manages, please let us know.
+
+---
+
+## Running tests
+
+```bash
+python -m pytest
+```
+
+Recreate snapshot files:
+
+```bash
+python -m pytest --snapshot-update
+```

tinyprint-0.3.0/bin/t

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# Convenience wrapper for test runs
+pytest
+mypy -p tinyprint

tinyprint-0.3.0/bin/tinyprint

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# vim: filetype=python
+"""This is a convenience script to run tinyprint GUI on dev mode
+
+(e.g. to start tinyprint with local, not-installed source)
+"""
+
+# Go up 1 level to reach tinyprint
+import sys, os
+sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
+
+from tinyprint import __main__
+__main__.main()

tinyprint-0.3.0/bin/upload2pypi

@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#! nix-shell ../pypishell.nix -i bash
+python -m build --sdist --wheel
+twine check dist/*
+twine upload dist/*

tinyprint-0.3.0/default.nix

@@ -0,0 +1,57 @@
+{ sources ? import nix/sources.nix, pkgs ? import sources.nixpkgs {}}:
+
+with pkgs;
+with pkgs.python311Packages;
+
+let
+
+  types-six = buildPythonPackage rec {
+    pname = "types-six";
+    version = "1.17.0.20241205";
+    format = "setuptools";
+
+    src = fetchPypi {
+      inherit version;
+      pname = "types_six";
+      hash = "sha256-H2YjR6jzsr8wUX1inYL1kUIN8pgReUsL84BOFNcW9uA=";
+    };
+
+    # Modules doesn't have tests
+    doCheck = false;
+
+    meta = with lib; {
+      description = "Typing stubs for six";
+      homepage = "https://github.com/python/typeshed";
+      license = licenses.asl20;
+    };
+  };
+
+  args = {sources=sources; pkgs=pkgs; pythonPackages=pythonPackages;};
+  python-escpos = import ./nix/python-escpos/default.nix args;
+
+in
+
+  buildPythonPackage rec {
+    name = "tinyprint";
+    src = ./.;
+    version = "0.1.0";
+    nativeCheckInputs = [ syrupy coverage pytest mypy types-pillow types-six ];
+    checkInputs = [ syrupy coverage pytest mypy types-pillow types-six ];
+    propagatedBuildInputs = [ 
+        python-escpos
+        tkinter
+        marko
+        dataclasses-json
+        pdf2image
+        platformdirs
+    ];
+    checkPhase = ''
+      runHook preCheck
+      pytest
+      mypy -p tinyprint
+      runHook postCheck
+    '';
+    doCheck = true;
+    format = "pyproject";
+  }
+

tinyprint-0.3.0/nix/python-escpos/default.nix

@@ -0,0 +1,37 @@
+{ sources ? import ../sources.nix, pkgs ? import sources.nixpkgs {}, pythonPackages ? pkgs.python310Packages}:
+
+with pkgs;
+with pythonPackages;
+
+buildPythonPackage rec {
+  name = "python-escpos";
+  pyproject = true;
+  src = fetchPypi {
+    pname = name;
+    version = "3.1";
+    sha256 = "sha256-MSQM3UOm0zccLFNvjewC8xv2julnzS7bJVqUz2cpWsA=";
+  };
+  prePatch = ''
+    export SETUPTOOLS_SCM_PRETEND_VERSION=3.1
+  '';
+  nativeBuildInputs = [
+      setuptools-scm
+  ];
+  propagatedBuildInputs = [ 
+    # https://github.com/python-escpos/python-escpos/blob/99501cc2c1d21ea156b8b8b530ad66c9c9d00fe3/setup.cfg#L39-L48C5
+      pycups
+      pillow
+      pyserial
+      pyusb
+      qrcode
+      six
+      appdirs
+      pyyaml
+      argparse
+      argcomplete
+      setuptools
+      importlib-resources
+      python-barcode
+  ];
+}
+

tinyprint-0.3.0/nix/sources.json

@@ -0,0 +1,14 @@
+{
+    "nixpkgs": {
+        "branch": "nixos-unstable",
+        "description": "Nix Packages collection",
+        "homepage": null,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
+        "sha256": "0qzxhnipsp48z9vx5xkdh74m6yny8k4ah6f47r1axk6lxhiwfdkj",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/303bd8071377433a2d8f76e684ec773d70c5b642.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}

tinyprint-0.3.0/nix/sources.nix

@@ -0,0 +1,194 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+      if spec.builtin or true then
+        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+      else
+        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+
+  fetch_tarball = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+      if spec.builtin or true then
+        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+      else
+        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+
+  fetch_git = name: spec:
+    let
+      ref =
+        if spec ? ref then spec.ref else
+          if spec ? branch then "refs/heads/${spec.branch}" else
+            if spec ? tag then "refs/tags/${spec.tag}" else
+              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+      submodules = if spec ? submodules then spec.submodules else false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules == true
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                {}
+            else {};
+        in
+          if nixSupportsSubmodules
+          then { inherit submodules; }
+          else emptyArgWithWarning;
+    in
+      builtins.fetchGit
+        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
+
+  fetch_local = spec: spec.path;
+
+  fetch_builtin-tarball = name: throw
+    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=tarball -a builtin=true'';
+
+  fetch_builtin-url = name: throw
+    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=file -a builtin=true'';
+
+  #
+  # Various helpers
+  #
+
+  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
+  sanitizeName = name:
+    (
+      concatMapStrings (s: if builtins.isList s then "-" else s)
+        (
+          builtins.split "[^[:alnum:]+._?=-]+"
+            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
+        )
+    );
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources: system:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+      if builtins.hasAttr "nixpkgs" sources
+      then sourcesNixpkgs
+      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+        import <nixpkgs> {}
+      else
+        abort
+          ''
+            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+            add a package called "nixpkgs" to your sources.json.
+          '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs name spec
+    else if spec.type == "tarball" then fetch_tarball pkgs name spec
+    else if spec.type == "git" then fetch_git name spec
+    else if spec.type == "local" then fetch_local spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
+    else if spec.type == "builtin-url" then fetch_builtin-url name
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # If the environment variable NIV_OVERRIDE_${name} is set, then use
+  # the path directly as opposed to the fetched source.
+  replace = name: drv:
+    let
+      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
+    in
+      if ersatz == "" then drv else
+        # this turns the string into an actual Nix path (for both absolute and
+        # relative paths)
+        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
+  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
+  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
+  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
+  concatMapStrings = f: list: concatStrings (map f list);
+  concatStrings = builtins.concatStringsSep "";
+
+  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
+  optionalAttrs = cond: as: if cond then as else {};
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
+      else
+        fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+      if lessThan nixVersion "1.12" then
+        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
+      else
+        fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs (
+      name: spec:
+        if builtins.hasAttr "outPath" spec
+        then abort
+          "The values in sources.json should not have an 'outPath' attribute"
+        else
+          spec // { outPath = replace name (fetch config.pkgs name spec); }
+    ) config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
+    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+    , system ? builtins.currentSystem
+    , pkgs ? mkPkgs sources system
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+
+in
+mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

tinyprint-0.3.0/pypishell.nix

@@ -0,0 +1,24 @@
+{ sources ? import nix/sources.nix, pkgs ? import sources.nixpkgs {}}:
+
+let
+
+  tinyprint = import ./default.nix {};
+
+  mypython = pkgs.python311.buildEnv.override {
+    extraLibs = with pkgs.python311Packages; [
+      # Needed for pypi upload
+      twine
+      wheel
+      setuptools
+      build
+    ];
+
+  };
+
+in
+
+  pkgs.mkShell {
+      buildInputs = with pkgs; [
+          mypython
+      ];
+  }

{tinyprint-0.2.4 → tinyprint-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tinyprint"
-version = "0.2.4"
+version = "0.3.0"
 authors = [
     {name = "Levin Eric Zimmermann", email = "levin.eric.zimmermann@posteo.com"},
 ]
@@ -10,8 +10,9 @@ readme = "README.md"
 dependencies = [
     'python-escpos[serial,usb]>=3.1',
     'dataclasses-json>=0.6.0',
-    'marko>=2.1.2',
+    'marko==2.1.2',
     'pdf2image>=1.17.0',
+    'platformdirs>=4.5.0',
 ]
 
 [project.optional-dependencies]