Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: adafruit/Adafruit_CircuitPython_ImageLoad
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: default-params
Choose a base ref
...
head repository: adafruit/Adafruit_CircuitPython_ImageLoad
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Aug 20, 2020

  1. Merge pull request #37 from adafruit/default-params

    Set bitmap and palette to have default values
    FoamyGuy authored Aug 20, 2020
    Copy the full SHA
    4aa1c1c View commit details

Commits on Aug 28, 2020

  1. Run tests in Actions

    tannewt committed Aug 28, 2020
    Copy the full SHA
    0bfd332 View commit details
  2. Lint

    tannewt committed Aug 28, 2020
    Copy the full SHA
    2a317a2 View commit details

Commits on Aug 31, 2020

  1. Merge pull request #38 from tannewt/run_tests

    Run tests in Actions
    kattni authored Aug 31, 2020
    Copy the full SHA
    32f1768 View commit details

Commits on Oct 25, 2020

  1. Merge pull request #1 from adafruit/master

    Merge from adafruit
    FoamyGuy authored Oct 25, 2020
    Copy the full SHA
    18b60df View commit details
  2. fix download link in docs

    FoamyGuy committed Oct 25, 2020
    Copy the full SHA
    d7497c1 View commit details
  3. Merge pull request #40 from FoamyGuy/fix_docs

    Fix docs
    ladyada authored Oct 25, 2020
    Copy the full SHA
    1aecf3f View commit details

Commits on Oct 31, 2020

  1. Merge pull request #2 from adafruit/master

    Merge from Adafruit
    FoamyGuy authored Oct 31, 2020
    Copy the full SHA
    59b7fd2 View commit details
  2. Copy the full SHA
    32721c0 View commit details
  3. Merge pull request #41 from FoamyGuy/fix_setup_py

    add sub packages to setup.py
    ladyada authored Oct 31, 2020
    Copy the full SHA
    d3f5d12 View commit details

Commits on Nov 24, 2020

  1. adding magtag example

    FoamyGuy committed Nov 24, 2020
    Copy the full SHA
    88b8bea View commit details
  2. import order 4 pylint

    FoamyGuy committed Nov 24, 2020
    Copy the full SHA
    e6dc7fa View commit details
  3. rename magtag example

    FoamyGuy committed Nov 24, 2020
    Copy the full SHA
    80d5f98 View commit details
  4. Merge pull request #42 from FoamyGuy/magtag_example

    MagTag example
    ladyada authored Nov 24, 2020
    Copy the full SHA
    0cd05c9 View commit details

Commits on Jan 11, 2021

  1. Added pre-commit-config file

    Signed-off-by: dherrada <dylan.herrada@adafruit.com>
    evaherrada committed Jan 11, 2021
    Copy the full SHA
    f339825 View commit details

Commits on Feb 4, 2021

  1. Copy the full SHA
    58b0182 View commit details

Commits on Feb 10, 2021

  1. Added extra authors

    evaherrada committed Feb 10, 2021
    Copy the full SHA
    5b0ae05 View commit details
  2. Hardcoded Black and REUSE versions

    Signed-off-by: dherrada <dylan.herrada@adafruit.com>
    evaherrada committed Feb 10, 2021
    Copy the full SHA
    8f9aa24 View commit details

Commits on Feb 11, 2021

  1. add author lines

    FoamyGuy committed Feb 11, 2021
    Copy the full SHA
    11f74a0 View commit details
  2. Merge pull request #43 from adafruit/REUSE

    Ran pre-commit, added licenses
    FoamyGuy authored Feb 11, 2021
    Copy the full SHA
    f83932d View commit details

Commits on Mar 2, 2021

  1. Removed pylint process from github workflow

    Signed-off-by: dherrada <dylan.herrada@adafruit.com>
    evaherrada committed Mar 2, 2021
    Copy the full SHA
    267f121 View commit details
  2. Re-added pylint install to build.yml

    Signed-off-by: dherrada <dylan.herrada@adafruit.com>
    evaherrada committed Mar 2, 2021
    Copy the full SHA
    6587a0b View commit details

Commits on Mar 16, 2021

  1. Copy the full SHA
    b1ccaf5 View commit details
  2. remove debug statement

    kmatch98 committed Mar 16, 2021
    Copy the full SHA
    98c57e6 View commit details
  3. Copy the full SHA
    883bbe9 View commit details
  4. Copy the full SHA
    2cb93b7 View commit details
  5. Merge pull request #46 from adafruit/tests-linting

    Linted tests, fixed duplicate-code failures
    kattni authored Mar 16, 2021
    Copy the full SHA
    28ba6d3 View commit details

Commits on Mar 19, 2021

  1. trigger GitHub actions

    kmatch98 committed Mar 19, 2021
    Copy the full SHA
    2caf187 View commit details
  2. Copy the full SHA
    e716587 View commit details
  3. Copy the full SHA
    cf6f2fc View commit details
  4. Merge pull request #45 from kmatch98/master

    Add option for using bitmaptools.readinto for indexed bitmap loads
    jepler authored Mar 19, 2021
    Copy the full SHA
    a73fe3b View commit details

Commits on Mar 21, 2021

  1. Copy the full SHA
    e74fe84 View commit details
  2. Copy the full SHA
    5328a86 View commit details
  3. Copy the full SHA
    869c38d View commit details

Commits on Mar 22, 2021

  1. Merge pull request #49 from kmatch98/readinto_fix

    update readinto input parameters
    tannewt authored Mar 22, 2021
    Copy the full SHA
    2c0b814 View commit details

Commits on Mar 23, 2021

  1. Merge branch 'adafruit_master' into readinto_fallback

    # Conflicts:
    #	adafruit_imageload/bmp/indexed.py
    FoamyGuy committed Mar 23, 2021
    Copy the full SHA
    ce79fef View commit details
  2. Merge pull request #48 from FoamyGuy/readinto_fallback

    readinto fallback for missing argument
    FoamyGuy authored Mar 23, 2021
    Copy the full SHA
    7f24d74 View commit details

Commits on May 19, 2021

  1. Added pull request template

    Signed-off-by: dherrada <dylan.herrada@adafruit.com>
    evaherrada committed May 19, 2021
    Copy the full SHA
    6107f77 View commit details
  2. Added help text and problem matcher

    Signed-off-by: dherrada <dylan.herrada@adafruit.com>
    evaherrada committed May 19, 2021
    Copy the full SHA
    333fcd5 View commit details

Commits on May 24, 2021

  1. Moved CI to Python 3.7

    Signed-off-by: dherrada <dylan.herrada@adafruit.com>
    evaherrada committed May 24, 2021
    Copy the full SHA
    b3aa09c View commit details

Commits on Jun 7, 2021

  1. Copy the full SHA
    681a604 View commit details

Commits on Jun 12, 2021

  1. Copy the full SHA
    985b0b1 View commit details
  2. BytesIO support

    FoamyGuy committed Jun 12, 2021
    Copy the full SHA
    c53d47b View commit details
  3. Merge pull request #52 from FoamyGuy/remove_readinot_fallback

    remove readinto fallback for 6.2.0-beta4
    deshipu authored Jun 12, 2021
    Copy the full SHA
    ffa6224 View commit details

Commits on Jun 13, 2021

  1. rename argument

    FoamyGuy committed Jun 13, 2021
    Copy the full SHA
    483e72a View commit details

Commits on Jun 15, 2021

  1. Merge pull request #53 from FoamyGuy/support_bytesio

    BytesIO support
    jepler authored Jun 15, 2021
    Copy the full SHA
    17624ad View commit details

Commits on Jul 2, 2021

  1. Update .gitignore

    lesamouraipourpre committed Jul 2, 2021
    Copy the full SHA
    1669a93 View commit details
  2. Copy the full SHA
    03b1896 View commit details
  3. Merge pull request #54 from lesamouraipourpre/max-size

    Remove max_size parameter
    FoamyGuy authored Jul 2, 2021
    Copy the full SHA
    071d6e8 View commit details

Commits on Sep 3, 2021

  1. CircuitPython 7 no longer allows StopIteration fallback

    Now we have to explicitly catch it.
    deshipu committed Sep 3, 2021
    Copy the full SHA
    45d8e1a View commit details
Showing with 2,289 additions and 1,157 deletions.
  1. +13 −0 .github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
  2. +6 −55 .github/workflows/build.yml
  3. +19 −0 .github/workflows/failure-help-text.yml
  4. +0 −81 .github/workflows/release.yml
  5. +19 −0 .github/workflows/release_gh.yml
  6. +19 −0 .github/workflows/release_pypi.yml
  7. +44 −5 .gitignore
  8. +22 −0 .pre-commit-config.yaml
  9. +0 −433 .pylintrc
  10. +22 −0 .readthedocs.yaml
  11. +0 −3 .readthedocs.yml
  12. +10 −4 CODE_OF_CONDUCT.md
  13. +324 −0 LICENSES/CC-BY-4.0.txt
  14. +19 −0 LICENSES/MIT.txt
  15. +20 −0 LICENSES/Unlicense.txt
  16. +15 −10 README.rst
  17. +3 −0 README.rst.license
  18. +52 −29 adafruit_imageload/__init__.py
  19. +62 −42 adafruit_imageload/bmp/__init__.py
  20. +81 −64 adafruit_imageload/bmp/indexed.py
  21. +8 −1 adafruit_imageload/bmp/negative_height_check.py
  22. +131 −0 adafruit_imageload/bmp/truecolor.py
  23. +28 −0 adafruit_imageload/displayio_types.py
  24. +53 −54 adafruit_imageload/gif.py
  25. +57 −0 adafruit_imageload/jpg.py
  26. +225 −0 adafruit_imageload/png.py
  27. +69 −35 adafruit_imageload/pnm/__init__.py
  28. +23 −23 adafruit_imageload/pnm/pbm_ascii.py
  29. +29 −27 adafruit_imageload/pnm/pbm_binary.py
  30. +24 −22 adafruit_imageload/pnm/pgm/__init__.py
  31. +32 −29 adafruit_imageload/pnm/pgm/ascii.py
  32. +34 −31 adafruit_imageload/pnm/pgm/binary.py
  33. +41 −32 adafruit_imageload/pnm/ppm_ascii.py
  34. +36 −31 adafruit_imageload/pnm/ppm_binary.py
  35. +109 −0 adafruit_imageload/tilegrid_inflator.py
  36. +3 −0 docs/_static/favicon.ico.license
  37. +9 −0 docs/api.rst
  38. +3 −0 docs/api.rst.license
  39. +17 −18 docs/conf.py
  40. +15 −0 docs/developing.rst
  41. +3 −0 docs/developing.rst.license
  42. +18 −0 docs/examples.rst
  43. +3 −0 docs/examples.rst.license
  44. +3 −2 docs/index.rst
  45. +3 −0 docs/index.rst.license
  46. +7 −0 docs/requirements.txt
  47. +5 −1 examples/imageload_colorwheel.py
  48. +48 −0 examples/imageload_from_web.py
  49. +23 −0 examples/imageload_jpg_simpletest.py
  50. +37 −0 examples/imageload_magtag_simpletest.py
  51. +10 −7 examples/imageload_netpbm.py
  52. +45 −0 examples/imageload_png_simpletest.py
  53. +5 −1 examples/imageload_simpletest.py
  54. +18 −0 examples/imageload_tilegrid_inflator_simpletest.py
  55. +2 −0 examples/images/1bit-not-byte-aligned.bmp.license
  56. +2 −0 examples/images/1bit.bmp.license
  57. +2 −0 examples/images/2bit.bmp.license
  58. +2 −0 examples/images/4bit.bmp.license
  59. +2 −0 examples/images/4bit_rle.bmp.license
  60. +2 −0 examples/images/8bit_rle.bmp.license
  61. BIN examples/images/castle_spritesheet.bmp
  62. +2 −0 examples/images/castle_spritesheet.bmp.license
  63. +2 −0 examples/images/color_wheel.bmp.license
  64. +2 −0 examples/images/color_wheel_rle.bmp.license
  65. BIN examples/images/jpg_test.jpg
  66. +2 −0 examples/images/jpg_test.jpg.license
  67. BIN examples/images/magtag_2x2_test.bmp
  68. +3 −0 examples/images/magtag_2x2_test.bmp.license
  69. +2 −0 examples/images/netpbm_p1_mono_ascii.pbm.license
  70. +1 −1 examples/images/netpbm_p2_ascii.pgm
  71. +2 −0 examples/images/netpbm_p2_ascii.pgm.license
  72. +1 −1 examples/images/netpbm_p3_rgb_ascii.ppm
  73. +2 −0 examples/images/netpbm_p3_rgb_ascii.ppm.license
  74. +2 −0 examples/images/netpbm_p4_mono_binary.pbm.license
  75. +2 −0 examples/images/netpbm_p4_mono_large.pbm.license
  76. +3 −0 examples/images/netpbm_p4_mono_width.pbm
  77. +2 −0 examples/images/netpbm_p4_mono_width.pbm.license
  78. +2 −0 examples/images/netpbm_p5_binary.pgm.license
  79. +2 −0 examples/images/netpbm_p6_binary.ppm.license
  80. BIN examples/images/test_image.png
  81. +2 −0 examples/images/test_image.png.license
  82. BIN examples/images/test_image_2bit.png
  83. +2 −0 examples/images/test_image_2bit.png.license
  84. BIN examples/images/test_image_grayscale.png
  85. +2 −0 examples/images/test_image_grayscale.png.license
  86. BIN examples/images/test_image_rgb.png
  87. +2 −0 examples/images/test_image_rgb.png.license
  88. +14 −0 mypy.ini
  89. +3 −0 optional_requirements.txt
  90. +52 −0 pyproject.toml
  91. +4 −0 requirements.txt
  92. +99 −0 ruff.toml
  93. +0 −50 setup.py
  94. +2 −0 tests/__init__.py.license
  95. +26 −25 tests/displayio_shared_bindings.py
  96. +2 −0 tests/displayio_shared_bindings.py.license
  97. +5 −11 tests/test_bitmap_c_interface.py
  98. +2 −0 tests/test_bitmap_c_interface.py.license
  99. +6 −4 tests/test_bmp_indexed_load.py
  100. +2 −0 tests/test_bmp_indexed_load.py.license
  101. +30 −21 tests/test_palette_c_interface.py
  102. +2 −0 tests/test_palette_c_interface.py.license
  103. +26 −4 tests/test_pbm_load.py
  104. +2 −0 tests/test_pbm_load.py.license
  105. +3 −0 tests/test_pgm_load.py
  106. +2 −0 tests/test_pgm_load.py.license
  107. BIN tests/test_png.png
  108. +2 −0 tests/test_png.png.license
  109. +24 −0 tests/test_png_load.py
  110. +3 −0 tests/test_ppm_load.py
  111. +2 −0 tests/test_ppm_load.py.license
13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# SPDX-FileCopyrightText: 2021 Adafruit Industries
#
# SPDX-License-Identifier: MIT

Thank you for contributing! Before you submit a pull request, please read the following.

Make sure any changes you're submitting are in line with the CircuitPython Design Guide, available here: https://docs.circuitpython.org/en/latest/docs/design_guide.html

If your changes are to documentation, please verify that the documentation builds locally by following the steps found here: https://adafru.it/build-docs

Before submitting the pull request, make sure you've run Pylint and Black locally on your code. You can do this manually or using pre-commit. Instructions are available here: https://adafru.it/check-your-code

Please remove all of this text before submitting. Include an explanation or list of changes included in your PR, as well as, if applicable, a link to any related issues.
61 changes: 6 additions & 55 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
#
# SPDX-License-Identifier: MIT

name: Build CI

on: [pull_request, push]
@@ -6,58 +10,5 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Dump GitHub context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Translate Repo Name For Build Tools filename_prefix
id: repo-name
run: |
echo ::set-output name=repo-name::$(
echo ${{ github.repository }} |
awk -F '\/' '{ print tolower($2) }' |
tr '_' '-'
)
- name: Set up Python 3.6
uses: actions/setup-python@v1
with:
python-version: 3.6
- name: Versions
run: |
python3 --version
- name: Checkout Current Repo
uses: actions/checkout@v1
with:
submodules: true
- name: Checkout tools repo
uses: actions/checkout@v2
with:
repository: adafruit/actions-ci-circuitpython-libs
path: actions-ci
- name: Install dependencies
# (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
run: |
source actions-ci/install.sh
- name: Pip install pylint, black, & Sphinx
run: |
pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
- name: Library version
run: git describe --dirty --always --tags
- name: Check formatting
run: |
black --check --target-version=py35 .
- name: PyLint
run: |
pylint $( find . -path './adafruit*.py' )
([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace $( find . -path "./examples/*.py" ))
- name: Build assets
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
- name: Build docs
working-directory: docs
run: sphinx-build -E -W -b html . _build/html
- name: Build Python package
run: |
pip install --upgrade setuptools wheel twine readme_renderer testresources
python setup.py sdist
python setup.py bdist_wheel --universal
twine check dist/*
- name: Run Build CI workflow
uses: adafruit/workflows-circuitpython-libs/build@main
19 changes: 19 additions & 0 deletions .github/workflows/failure-help-text.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# SPDX-FileCopyrightText: 2021 Scott Shawcroft for Adafruit Industries
#
# SPDX-License-Identifier: MIT

name: Failure help text

on:
workflow_run:
workflows: ["Build CI"]
types:
- completed

jobs:
post-help:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
steps:
- name: Post comment to help
uses: adafruit/circuitpython-action-library-ci-failed@v1
81 changes: 0 additions & 81 deletions .github/workflows/release.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/release_gh.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
#
# SPDX-License-Identifier: MIT

name: GitHub Release Actions

on:
release:
types: [published]

jobs:
upload-release-assets:
runs-on: ubuntu-latest
steps:
- name: Run GitHub Release CI workflow
uses: adafruit/workflows-circuitpython-libs/release-gh@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
upload-url: ${{ github.event.release.upload_url }}
19 changes: 19 additions & 0 deletions .github/workflows/release_pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
#
# SPDX-License-Identifier: MIT

name: PyPI Release Actions

on:
release:
types: [published]

jobs:
upload-release-assets:
runs-on: ubuntu-latest
steps:
- name: Run PyPI Release CI workflow
uses: adafruit/workflows-circuitpython-libs/release-pypi@main
with:
pypi-username: ${{ secrets.pypi_username }}
pypi-password: ${{ secrets.pypi_password }}
49 changes: 44 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,48 @@
# SPDX-FileCopyrightText: 2022 Kattni Rembor, written for Adafruit Industries
#
# SPDX-License-Identifier: MIT

# Do not include files and directories created by your personal work environment, such as the IDE
# you use, except for those already listed here. Pull requests including changes to this file will
# not be accepted.

# This .gitignore file contains rules for files generated by working with CircuitPython libraries,
# including building Sphinx, testing with pip, and creating a virual environment, as well as the
# MacOS and IDE-specific files generated by using MacOS in general, or the PyCharm or VSCode IDEs.

# If you find that there are files being generated on your machine that should not be included in
# your git commit, you should create a .gitignore_global file on your computer to include the
# files created by your personal setup. To do so, follow the two steps below.

# First, create a file called .gitignore_global somewhere convenient for you, and add rules for
# the files you want to exclude from git commits.

# Second, configure Git to use the exclude file for all Git repositories by running the
# following via commandline, replacing "path/to/your/" with the actual path to your newly created
# .gitignore_global file:
# git config --global core.excludesfile path/to/your/.gitignore_global

# CircuitPython-specific files
*.mpy

# Python-specific files
__pycache__
_build
*.pyc

# Sphinx build-specific files
_build

# This file results from running `pip -e install .` in a local repository
*.egg-info

# Virtual environment-specific files
.env
bundles
.idea/
venv/
.venv

# MacOS-specific files
*.DS_Store

# IDE-specific files
.idea
.vscode
.DS_STORE
*~
22 changes: 22 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
# SPDX-FileCopyrightText: 2024 Justin Myers
#
# SPDX-License-Identifier: Unlicense

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.4
hooks:
- id: ruff-format
- id: ruff
args: ["--fix"]
- repo: https://github.com/fsfe/reuse-tool
rev: v3.0.1
hooks:
- id: reuse
Loading