Release 0.2.1

### Fixed - Fixed broken transparency on palettized PNG files ### Changed - Changed which wheels are built by the CI. There are no changes to OS or Python version compatibility if you compile from source. - Stopped building Python 3.7 wheels - Stopped building macOS universal wheels - Wheels for macOS now require macOS 12 or later - Included macOS ARM wheels - Included Python 3.12 wheels
skip python3.7 because its EOL
2024-09-13 06:37:34 +00:00 · 2024-06-02 18:58:48 -07:00 · 2024-06-02 17:56:13 -07:00 · 2024-06-02 17:43:33 -07:00 · 2024-06-02 17:32:00 -07:00 · 2023-06-21 15:46:13 -07:00
82 changed files with 831 additions and 527 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -0,0 +1,8 @@
+# git-blame ignored revisions
+# To configure, run
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+# Requires Git > 2.23
+# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
+
+# Migrate code style to Black
+cb84f32edab717389d03a3855aa5bd4d0db1ae3c
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -4,6 +4,13 @@ updates:

  - package-ecosystem: "github-actions"
    directory: "/"
+    target-branch: "dev"
    schedule:
      # Check for updates to GitHub Actions every weekday
-      interval: "daily"
+      interval: "daily"
+      
+   # Maintain dependencies for pip
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@ -16,7 +16,9 @@ jobs:
          fetch-depth: 0

      - name: Set up Python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.3.0
+        with:
+          python-version: '3.x'

      - name: Install dependencies
        run: |
@ -43,15 +45,13 @@ jobs:
          path: dist/*.tar.gz

  build-wheels:
-    name: Build Wheels on ${{ matrix.os }} ${{ matrix.arch[0] }}
+    name: Build Wheels on ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ macos-11, windows-latest, ubuntu-latest ]
-        arch: [ ['x86', 'x86_64', 'AMD64', 'x86_64' ] ] #[suffix, mac, windows, linux] arch names
-        include:
-          - os: ubuntu-latest
-            arch: [ 'ARM', 'arm64', 'ARM64', 'aarch64' ]
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        linux_arch: [ 'x86_64' ] #[suffix, mac, windows, linux] arch names

    steps:
      - uses: actions/checkout@v3
@ -69,17 +69,19 @@ jobs:
          sudo tar fvxz openmp-*.tar.gz -C /

      - name: Install QEMU
-        # install QEMU if building for arm linux
-        uses: docker/setup-qemu-action@v1
-        if: runner.os == 'linux' && matrix.arch[3] == 'aarch64'
+        # install QEMU if building for linux
+        uses: docker/setup-qemu-action@v2
+        if: runner.os == 'linux' 
        with:
          platforms: arm64

      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.4.0
+        uses: pypa/cibuildwheel@v2.18.1
        env:
-          MACOSX_DEPLOYMENT_TARGET: "10.15"
-          CIBW_ARCHS_LINUX: ${{ matrix.arch[3] }}
+          MACOSX_DEPLOYMENT_TARGET: "12"
+          CIBW_ARCHS_LINUX: 'x86_64 aarch64'
+          CIBW_ARCHS_MACOS: 'native'
+          CIBW_SKIP: 'cp37*'

      - name: Upload Wheels
        uses: actions/upload-artifact@v3
@ -96,7 +98,9 @@ jobs:
      - uses: actions/checkout@v3 # just need the changelog

      - name: Set up Python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.3.0
+        with:
+          python-version: '3.x'

      - name: Install dependencies
        run: |
@ -135,4 +139,4 @@ jobs:
          name: ${{ env.VERSION_TITLE }}
          body_path: RELEASE.md
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,8 @@ build/
 *.egg-info
 *.pyc
 *.pyi
+*.whl
+*.tar.gz

 #sphinx
 docs/_build/
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@ -0,0 +1,28 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.10"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+formats:
+  - pdf
+
+# Give python build instructions
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,35 @@

 All notable changes to this project will be documented in this file

+## 0.2.1 - 2024-06-03
+
+### Fixed
+
+- Fixed broken transparency on palettized PNG files
+
+### Changed
+
+- Changed which wheels are built by the CI. There are no changes to OS or Python version compatibility if you compile from source.
+	- Stopped building Python 3.7 wheels
+	- Stopped building macOS universal wheels
+	- Wheels for macOS now require macOS 12 or later
+	- Included macOS ARM wheels 
+	- Included Python 3.12 wheels
+
+
+## 0.2.0 - 2023-06-21
+
+### Changed
+
+- Updated Pybind11 to version 3.10, adding Python 3.11 support
+- Updated install instructions in readme to reflect availability on PyPI
+- Encode now skips .dds files in its input to prevent needless re-encoding
+
+### Added
+
+- Added the `-n` option for bc3 encoding to perform a BC3nm swizzle
+
+
 ## 0.1.3 - 2022-04-13

 ### Fixed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.18)
-include(CheckIPOSupported)
 include(tools/CompilerWarnings.cmake)
+set(CMAKE_VERBOSE_MAKEFILE ON)

 project(quicktex)

@ -30,8 +30,6 @@ file(GLOB HEADER_FILES
        "quicktex/s3tc/interpolator/*.h"
        )

-file(GLOB TEST_FILES "tests/*.cpp")
-
 file(GLOB_RECURSE PYTHON_FILES "src/**/*.py")

 # Organize source files together for some IDEs
@ -42,34 +40,24 @@ pybind11_add_module(_quicktex
        ${SOURCE_FILES}
        ${HEADER_FILES})

-add_executable(test_quicktex
-        ${SOURCE_FILES}
-        ${HEADER_FILES}
-        ${TEST_FILES})
-
-target_link_libraries(test_quicktex PRIVATE pybind11::embed)
-
-target_compile_definitions(test_quicktex PRIVATE -DCUSTOM_SYS_PATH="${CMAKE_HOME_DIRECTORY}/env/lib/python3.9/site-packages")
+# Set Quicktex version info
 target_compile_definitions(_quicktex PRIVATE VERSION_INFO=${QUICKTEX_VERSION_INFO})

 # enable openMP if available
 if (OpenMP_CXX_FOUND)
    target_link_libraries(_quicktex PUBLIC OpenMP::OpenMP_CXX)
-    target_link_libraries(test_quicktex PUBLIC OpenMP::OpenMP_CXX)
 endif ()

 # Set module features, like C/C++ standards
 target_compile_features(_quicktex PUBLIC cxx_std_17 c_std_11)
-target_compile_features(test_quicktex PUBLIC cxx_std_17 c_std_11)

+# Set compiler warnings
 set_project_warnings(_quicktex)
-set_project_warnings(test_quicktex)
-
-set(CMAKE_VERBOSE_MAKEFILE ON)

+# Clang-specific
 if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer")
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -stdlib=libc++ -fsanitize=undefined")
    set(PROJECT_WARNINGS ${CLANG_WARNINGS})
 endif ()
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@ -0,0 +1,25 @@
+# Development
+
+This document outlines how to set up a development environment for Quicktex. Documentation on writing Python extension modules is sparse, so I hope this document is useful for other projects as well. The [Coding Patterns for Python Extensions](https://pythonextensionpatterns.readthedocs.io/en/latest/) site has some useful information and will be linked to often in this document. 
+
+## Setting up Debug Python
+
+Many development tools require debug symbols to function, and since the front-end for accessing an extension module is Python, that usually means adding debug symbols to Python. [This Page](https://pythonextensionpatterns.readthedocs.io/en/latest/debugging/debug_python.html) has some instructions on building python with debug symbols. 
+
+If you plan to use DTrace, enable the `--with-dtrace` flag when running `configure`. 
+
+It's useful for this debug python to have SSL enabled so that packages can be installed using pip. Enable SSL with the `--with-openssl` flag when running `configure`. If you are on macOS and installed OpenSSL through Homebrew, you may need to use `--with-openssl=$(brew --prefix openssl)` to help the compiler find it. 
+
+### Installing Debug Python
+
+You can keep the resulting binary in your local copy of the cpython repo and symlink to it, but I like to install it somewhere like `/opt/python-debug/`. The install location is set in the `configure` tool using the `--prefix` flag, and installation is done by running `make install`
+
+### Mixing Debug and Release Python
+
+The debug build of python is slow (It may be possible to build with debug symbols but full optimization, I have not looked into it). If you already have a venv setup for your project, you can just symlink the debug python binary into `env/bin` with a full name like `python3.9d`. Make sure that the debug build has the same minor version (e.g '3.9') as the version you made the virtual environment with to maintain ABI compatibility. 
+
+## Profiling with Dtrace
+
+DTrace is the default program profiler on macOS and other Unix systems, but it's also available for use on Windows and Linux. Using DTrace requires building Python with DTrace hooks as seen above. 
+
+Your extension module does not need a full debug build to profile, but it does need frame pointers to see the stack trace at each sample, as well as debug symbols to give functions names. The cmake build type `RelWithDebInfo` handles this automatically. 
--- a/README.md
+++ b/README.md
@ -9,15 +9,32 @@ comparable to the original library.

 ## Installation

-To install, first clone this repo and cd into it, then run:
+### From Wheel (Easiest)
+
+To install, run
+
+```shell
+pip install quicktex
+```
+
+If you are on macOS, You need to install openMP from homebrew:
+
+```shell
+brew install libomp
+```
+
+### From Source
+
+To build from source, first clone this repo and cd into it, then run:

 ```shell
 git submodule update --init
 pip install .
 ```
+
 and setuptools will take care of any dependencies for you.

-If you are on macOS, it is recommended to first install openMP from homebrew to enable 
+If you are on macOS, it is recommended to first install openMP from homebrew to enable
 multithreading, since it is not included in the default Apple Clang install:

 ```shell
@ -31,8 +48,6 @@ required dependencies for them, install with options like so:
 pip install .[tests,stubs,docs]
 ```

-Quicktex will be available on Pypi once it is out of alpha.
-
 ## Usage

 ```
--- a/docs/changelog.md
+++ b/docs/changelog.md
@ -0,0 +1,2 @@
+```{include} ../CHANGELOG.md
+```
--- a/docs/conf.py
+++ b/docs/conf.py
@ -13,12 +13,13 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('..'))
+from datetime import date


 # -- Project information -----------------------------------------------------

 project = 'Quicktex'
-copyright = '2021, Andrew Cassidy'
+copyright = f'{date.today().year}, Andrew Cassidy'
 author = 'Andrew Cassidy'

 # -- General configuration ---------------------------------------------------
@ -28,11 +29,14 @@ author = 'Andrew Cassidy'
 # ones.
 extensions = [
    'myst_parser',
+    'sphinx_click',
    'sphinx_rtd_theme',
    'sphinx.ext.autodoc',
    'sphinx.ext.intersphinx',
 ]

+myst_heading_anchors = 2
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

@ -70,5 +74,5 @@ autodoc_default_options = {
 # should be linked to in this documentation.
 intersphinx_mapping = {
    'python': ('https://docs.python.org/3', None),
-    'PIL': ('https://pillow.readthedocs.io/en/stable/', None)
+    'PIL': ('https://pillow.readthedocs.io/en/stable/', None),
 }
--- a/docs/development.md
+++ b/docs/development.md
@ -0,0 +1,2 @@
+```{include} ../DEVELOPMENT.md
+```
--- a/docs/handbook/commands.md
+++ b/docs/handbook/commands.md
@ -0,0 +1,7 @@
+# Command Reference
+
+```{eval-rst}
+.. click:: quicktex.__main__:main
+   :prog: quicktex
+   :nested: full
+```
--- a/docs/handbook/getting_started.md
+++ b/docs/handbook/getting_started.md
@ -0,0 +1,84 @@
+# Getting Started
+
+## Installation
+
+Install and update using [pip](https://pip.pypa.io/en/stable/quickstart/):
+
+```shell
+pip install -U quicktex
+```
+
+If you are on macOS, you need to install openMP to allow multithreading, since it does not ship with the built-in Clang.
+This can be done easily
+using [homebrew](https://brew.sh). This is not required if building from source, but highly recommended.
+
+```shell
+brew install libomp
+```
+
+If you want, you can also install from source. First clone the [git repo](https://github.com/drewcassidy/quicktex) and
+install it with:
+
+```shell
+pip install .
+```
+
+and setuptools will take care of any dependencies for you.
+
+The package also makes tests, stub generation, and docs available. To install the
+required dependencies for them, install with options like so:
+
+```shell
+pip install quicktex[tests,stubs,docs]
+```
+
+## Usage
+
+For detailed documentation on the {command}`quicktex` command and its subcommands see the {doc}`commands`.
+
+### Examples
+
+#### Encoding a file
+
+To encode a file in place, use the {command}`encode` command
+
+```shell
+quicktex encode auto bun.png # chooses format based on alpha
+quicktex encode bc3 bun.png # encodes as bc3
+```
+
+the auto subcommand automatically chooses between bc1 and bc3 for your image depending on the contents of its alpha
+channel. Quicktex supports reading from all image formats supported by [pillow](https://pillow.readthedocs.io/en/stable/handbook/image-file-formats.html).
+
+By default, Quicktex converts in place, meaning the above command will produce a `bun.dds` file alongside the png. If
+you want to replace the png, use the `-r` flag to remove it after converting.
+
+if you want to specify an output filename or directory use the `-o` flag.
+
+```shell
+quicktex encode auto -o rabbit.dds bun.png # produces rabbit.dds
+quicktex.encode auto -o textures/ bun.png # produces textures/bun.dds, if textures/ exists
+```
+
+#### Encoding multiple files
+
+quicktex is also able to convert multiple files at once, for example, to encode every png file in the images folder,
+use:
+
+```shell
+quicktex encode auto images/*.png # encodes in-place
+quicktex encode auto -o textures/ images/*.png # encodes to the textures/ directory
+```
+
+please note that globbing is an operation performed by your shell and is not supported by the built in windows `cmd.exe`
+. If you are on Windows, please use Powershell or any posix-ish shell like [fish](https://fishshell.com).
+
+#### Decoding files
+
+decoding is performed exactly the same as encoding, except without having to specify a format. The output image format
+is set using the `-x` flag, and defaults to png. Quicktex supports writing to all image formats supported by [pillow](https://pillow.readthedocs.io/en/stable/handbook/image-file-formats.html)
+
+```shell
+quicktex decode bun.dds # produces bun.png
+quicktex decode -x .tga bun2.dds # produces bun.tga
+```
--- a/docs/handbook/index.md
+++ b/docs/handbook/index.md
@ -0,0 +1,10 @@
+# Handbook
+
+```{toctree}
+---
+maxdepth: 3
+---
+
+commands
+getting_started
+```
--- a/docs/index.md
+++ b/docs/index.md
@ -0,0 +1,35 @@
+# Welcome to Quicktex's Documentation
+
+[![Documentation Status](https://readthedocs.org/projects/quicktex/badge/?version=latest)](https://quicktex.readthedocs.io/en/latest/?badge=latest)
+[![Python Package](https://github.com/drewcassidy/quicktex/actions/workflows/python-package.yml/badge.svg)](https://github.com/drewcassidy/quicktex/actions/workflows/python-package.yml)
+[![PyPI version](https://badge.fury.io/py/quicktex.svg)](https://badge.fury.io/py/quicktex)
+
+Quicktex is a Python library for encoding, decoding, and manipulating compressed textures. It uses a backend written in
+C++ for superior performance, as well as an extensive API for low-level access to the texture data. The compression
+engine is based in [rgbcx](https://github.com/richgel999/bc7enc).
+
+```{toctree}
+---
+maxdepth: 2
+caption: Contents
+---
+
+handbook/index
+reference/index
+```
+
+```{toctree}
+---
+maxdepth: 1
+---
+
+development
+Changelog <changelog>
+License <license>
+```
+
+## Indices and tables
+
+* {ref}`genindex`
+* {ref}`modindex`
+* {ref}`search`
--- a/docs/index.rst
+++ b/docs/index.rst
@ -1,15 +0,0 @@
-Welcome to Quicktex's documentation!
-========================================
-
-.. toctree::
-   :maxdepth: 2
-
-   reference/index.rst
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
--- a/docs/license.md
+++ b/docs/license.md
@ -0,0 +1,2 @@
+```{include} ../LICENSE.md
+```
--- a/docs/reference/conversion.rst
+++ b/docs/reference/conversion.rst
@ -1,10 +0,0 @@
-.. py:currentmodule:: quicktex
-
-Conversion
-============
-
-.. autoclass:: BlockEncoder
-    :members:
-
-.. autoclass:: BlockDecoder
-    :members:
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@ -1,10 +1,9 @@
-Reference
-=========
+API Reference
+=============

 .. toctree::
    :maxdepth: 2

-    conversion.rst
    dds.rst
    image_utils.rst
    formats/index.rst
--- a/pyproject.toml
+++ b/pyproject.toml
@ -4,7 +4,7 @@ requires = [
    "setuptools_scm>=6.2",
    "wheel",
    "cmake>=3.18",
-    "pybind11~=2.6.1",
+    "pybind11~=2.10",
    "ninja; sys_platform != 'win32'",
 ]
 build-backend = "setuptools.build_meta"
@ -36,11 +36,17 @@ dependencies = ["Pillow", "click"]
 dynamic = ["version"]

 [project.optional-dependencies]
-tests = ["parameterized"]
-docs = ["sphinx", "myst-parser", "sphinx-rtd-theme"]
+tests = ["parameterized", "pytest"]
+docs = [
+    "Sphinx >= 3.5",
+    "sphinx-click >= 2.7",
+    "sphinx-rtd-theme",
+    "myst-parser >= 0.14",
+]
 stubs = ["pybind11-stubgen"]

 [project.urls]
+Docs = "https://quicktex.readthedocs.io/en/latest/"
 Source = "https://github.com/drewcassidy/quicktex"
 Changelog = "https://github.com/drewcassidy/quicktex/blob/main/CHANGELOG.md"

@ -58,7 +64,7 @@ package-dir = { '' = '.' } # without this line, C++ source files get included in
 [tool.cibuildwheel]
 build = "cp*" # only build wheels for cpython.
 build-frontend = "build"
-test-command = "cd {project} && python -m unittest --verbose"
+test-command = "pytest {project}/tests --verbose"
 test-extras = ["tests"]

 [tool.cibuildwheel.macos]
@ -67,9 +73,13 @@ skip = ["cp{38,39,31*}-macosx_x86_64"] # skip x86-only builds where fat binaries

 [tool.cibuildwheel.windows]
 archs = ["auto64"] # arm64 windows builds not yet supported
-test-command = "cd /d {project} && python -m unittest --verbose" # windows why is this flag required

 [tool.cibuildwheel.linux]
 skip = ["cp37-musllinux*", "*musllinux_aarch64*"] # skip targets without available Pillow wheels
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
+
+[tool.black]
+line-length = 120 # 80-column is stupid
+target-version = ['py37', 'py38', 'py39', 'py310', 'py310']
+skip-string-normalization = true
--- a/quicktex/Color.cpp
+++ b/quicktex/Color.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Color.h
+++ b/quicktex/Color.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/ColorBlock.h
+++ b/quicktex/ColorBlock.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Decoder.h
+++ b/quicktex/Decoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich 2020 <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Encoder.h
+++ b/quicktex/Encoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich 2020 <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Matrix4x4.cpp
+++ b/quicktex/Matrix4x4.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Matrix4x4.h
+++ b/quicktex/Matrix4x4.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Texture.h
+++ b/quicktex/Texture.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Vector4.h
+++ b/quicktex/Vector4.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/Vector4Int.h
+++ b/quicktex/Vector4Int.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/main.py
+++ b/quicktex/main.py
@ -1,6 +1,7 @@
 import click
-from quicktex.cli.encode import encode
+
 from quicktex.cli.decode import decode
+from quicktex.cli.encode import encode


@click.group()
--- a/quicktex/_bindings.cpp
+++ b/quicktex/_bindings.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/_bindings.h
+++ b/quicktex/_bindings.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/bitwiseEnums.h
+++ b/quicktex/bitwiseEnums.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich 2020 <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/cli/common.py
+++ b/quicktex/cli/common.py
@ -1,7 +1,8 @@
-from PIL import Image
-from typing import List
 import pathlib
+from typing import List
+
 import click
+from PIL import Image


 def get_decoded_extensions(feature: str = 'open') -> List[str]:
@ -39,7 +40,7 @@ def path_pairs(inputs, output, suffix, extension):
    """

    if len(inputs) < 1:
-        raise click.BadArgumentUsage('No input files were provided.')
+        raise click.BadArgumentUsage('No valid input files were provided.')

    inpaths = [pathlib.Path(i) for i in inputs]

--- a/quicktex/cli/decode.py
+++ b/quicktex/cli/decode.py
@ -1,28 +1,49 @@
-import click
 import os.path
-import quicktex.dds as dds
-import quicktex.cli.common as common
+
+import click
 from PIL import Image

+import quicktex.cli.common as common
+import quicktex.dds as dds
+

@click.command()
-@click.option('-f/-F', '--flip/--no-flip', default=True, show_default=True, help="Vertically flip image after converting.")
+@click.option(
+    '-f/-F', '--flip/--no-flip', default=True, show_default=True, help="Vertically flip image after converting."
+)
@click.option('-r', '--remove', is_flag=True, help="Remove input images after converting.")
-@click.option('-s', '--suffix', type=str, default='', help="Suffix to append to output file(s). Ignored if output is a single file.")
-@click.option('-x', '--extension',
-              callback=common.validate_decoded_extension,
-              type=str, default='.png', show_default=True,
-              help="Extension to use for output. Ignored if output is a single file. Output filetype is deduced from this")
-@click.option('-o', '--output',
-              type=click.Path(writable=True), default=None,
-              help="Output file or directory. If outputting to a file, input filenames must be only a single item. By default, files are decoded in place.")
+@click.option(
+    '-s',
+    '--suffix',
+    type=str,
+    default='',
+    help="Suffix to append to output file(s). Ignored if output is a single file.",
+)
+@click.option(
+    '-x',
+    '--extension',
+    callback=common.validate_decoded_extension,
+    type=str,
+    default='.png',
+    show_default=True,
+    help="Extension to use for output. Ignored if output is a single file. Output filetype is deduced from this",
+)
+@click.option(
+    '-o',
+    '--output',
+    type=click.Path(writable=True),
+    default=None,
+    help="Output file or directory. If outputting to a file, input filenames must be only a single item. By default, files are decoded in place.",
+)
@click.argument('filenames', nargs=-1, type=click.Path(exists=True, readable=True, dir_okay=False))
 def decode(flip, remove, suffix, extension, output, filenames):
    """Decode DDS files to images."""

    path_pairs = common.path_pairs(filenames, output, suffix, extension)

-    with click.progressbar(path_pairs, show_eta=False, show_pos=True, item_show_func=lambda x: str(x[0]) if x else '') as bar:
+    with click.progressbar(
+        path_pairs, show_eta=False, show_pos=True, item_show_func=lambda x: str(x[0]) if x else ''
+    ) as bar:
        for inpath, outpath in bar:
            if inpath.suffix != '.dds':
                raise click.BadArgumentUsage(f"Input file '{inpath}' is not a DDS file.")
--- a/quicktex/cli/encode.py
+++ b/quicktex/cli/encode.py
@ -1,13 +1,14 @@
-import click
 import os
-import pathlib
+
+import click
+from PIL import Image
+
+import quicktex.cli.common as common
+import quicktex.dds as dds
 import quicktex.s3tc.bc1
 import quicktex.s3tc.bc3
 import quicktex.s3tc.bc4
 import quicktex.s3tc.bc5
-import quicktex.dds as dds
-import quicktex.cli.common as common
-from PIL import Image


@click.group()
@ -16,23 +17,43 @@ def encode():


@click.command()
-@click.option('-f/-F', '--flip/--no-flip', default=True, show_default=True, help="Vertically flip image before converting.")
+@click.option(
+    '-f/-F', '--flip/--no-flip', default=True, show_default=True, help="Vertically flip image before converting."
+)
@click.option('-r', '--remove', is_flag=True, help="Remove input images after converting.")
-@click.option('-s', '--suffix', type=str, default='', help="Suffix to append to output file(s). Ignored if output is a single file.")
-@click.option('-o', '--output',
-              type=click.Path(writable=True), default=None,
-              help="Output file or directory. If outputting to a file, input filenames must be only a single item. By default, files are decoded in place.")
+@click.option(
+    '-s',
+    '--suffix',
+    type=str,
+    default='',
+    help="Suffix to append to output file(s). Ignored if output is a single file.",
+)
+@click.option(
+    '-o',
+    '--output',
+    type=click.Path(writable=True),
+    default=None,
+    help="Output file or directory. If outputting to a file, input filenames must be only a single item. By default, files are decoded in place.",
+)
@click.argument('filenames', nargs=-1, type=click.Path(exists=True, readable=True, dir_okay=False))
-def encode_format(encoder, four_cc, flip, remove, suffix, output, filenames):
+def encode_format(encoder, four_cc, flip, remove, suffix, output, filenames, swizzle=False):
+    filenames = [f for f in filenames if not f.endswith('.dds')]
    path_pairs = common.path_pairs(filenames, output, suffix, '.dds')

-    with click.progressbar(path_pairs, show_eta=False, show_pos=True, item_show_func=lambda x: str(x[0]) if x else '') as bar:
+    with click.progressbar(
+        path_pairs, show_eta=False, show_pos=True, item_show_func=lambda x: str(x[0]) if x else ''
+    ) as bar:
        for inpath, outpath in bar:
            image = Image.open(inpath)

            if flip:
                image = image.transpose(Image.FLIP_TOP_BOTTOM)

+            if swizzle:
+                bands = image.split()
+                one = Image.new('L', image.size, 0xFF)
+                image = Image.merge('RGBA', (one, bands[1], bands[1], bands[0]))
+
            dds.encode(image, encoder, four_cc).save(outpath)

            if remove:
@ -40,17 +61,44 @@ def encode_format(encoder, four_cc, flip, remove, suffix, output, filenames):


@click.command('auto')
-@click.option('-l', '--level', type=click.IntRange(0, 18), default=18, help='Quality level to use. Higher values = higher quality, but slower.')
-@click.option('-b/-B', '--black/--no-black',
-              help='[BC1 only] Enable 3-color mode for blocks containing black or very dark pixels. --3color must also be enabled for this to work.'
-                   ' (Important: engine/shader MUST ignore decoded texture alpha if this flag is enabled!)')
-@click.option('-3/-4', '--3color/--4color', 'threecolor', default=True, help='[BC1 only] Enable 3-color mode for non-black pixels. Higher quality, but slightly slower.')
-@click.option('-f/-F', '--flip/--no-flip', default=True, show_default=True, help="Vertically flip image before converting.")
+@click.option(
+    '-l',
+    '--level',
+    type=click.IntRange(0, 18),
+    default=18,
+    help='Quality level to use. Higher values = higher quality, but slower.',
+)
+@click.option(
+    '-b/-B',
+    '--black/--no-black',
+    help='[BC1 only] Enable 3-color mode for blocks containing black or very dark pixels. --3color must also be enabled for this to work.'
+    ' (Important: engine/shader MUST ignore decoded texture alpha if this flag is enabled!)',
+)
+@click.option(
+    '-3/-4',
+    '--3color/--4color',
+    'threecolor',
+    default=True,
+    help='[BC1 only] Enable 3-color mode for non-black pixels. Higher quality, but slightly slower.',
+)
+@click.option(
+    '-f/-F', '--flip/--no-flip', default=True, show_default=True, help="Vertically flip image before converting."
+)
@click.option('-r', '--remove', is_flag=True, help="Remove input images after converting.")
-@click.option('-s', '--suffix', type=str, default='', help="Suffix to append to output file(s). Ignored if output is a single file.")
-@click.option('-o', '--output',
-              type=click.Path(writable=True), default=None,
-              help="Output file or directory. If outputting to a file, input filenames must be only a single item. By default, files are decoded in place.")
+@click.option(
+    '-s',
+    '--suffix',
+    type=str,
+    default='',
+    help="Suffix to append to output file(s). Ignored if output is a single file.",
+)
+@click.option(
+    '-o',
+    '--output',
+    type=click.Path(writable=True),
+    default=None,
+    help="Output file or directory. If outputting to a file, input filenames must be only a single item. By default, files are decoded in place.",
+)
@click.argument('filenames', nargs=-1, type=click.Path(exists=True, readable=True, dir_okay=False))
 def encode_auto(level, black, threecolor, flip, remove, suffix, output, filenames):
    """Encode images to BC1 or BC3, with the format chosen based on each image's alpha channel."""
@ -65,9 +113,14 @@ def encode_auto(level, black, threecolor, flip, remove, suffix, output, filename

    bc1_encoder = quicktex.s3tc.bc1.BC1Encoder(level, mode)
    bc3_encoder = quicktex.s3tc.bc3.BC3Encoder(level)
+    filenames = [f for f in filenames if not f.endswith('.dds')]
    path_pairs = common.path_pairs(filenames, output, suffix, '.dds')

-    with click.progressbar(path_pairs, show_eta=False, show_pos=True, item_show_func=lambda x: str(x[0]) if x else '') as bar:
+    assert len(filenames) > 0
+
+    with click.progressbar(
+        path_pairs, show_eta=False, show_pos=True, item_show_func=lambda x: str(x[0]) if x else ''
+    ) as bar:
        for inpath, outpath in bar:
            image = Image.open(inpath)

@ -90,11 +143,26 @@ def encode_auto(level, black, threecolor, flip, remove, suffix, output, filename


@click.command('bc1')
-@click.option('-l', '--level', type=click.IntRange(0, 18), default=18, help='Quality level to use. Higher values = higher quality, but slower.')
-@click.option('-b/-B', '--black/--no-black',
-              help='Enable 3-color mode for blocks containing black or very dark pixels. --3color must also be enabled for this to work.'
-                   ' (Important: engine/shader MUST ignore decoded texture alpha if this flag is enabled!)')
-@click.option('-3/-4', '--3color/--4color', 'threecolor', default=True, help='Enable 3-color mode for non-black pixels. Higher quality, but slightly slower.')
+@click.option(
+    '-l',
+    '--level',
+    type=click.IntRange(0, 18),
+    default=18,
+    help='Quality level to use. Higher values = higher quality, but slower.',
+)
+@click.option(
+    '-b/-B',
+    '--black/--no-black',
+    help='Enable 3-color mode for blocks containing black or very dark pixels. --3color must also be enabled for this to work.'
+    ' (Important: engine/shader MUST ignore decoded texture alpha if this flag is enabled!)',
+)
+@click.option(
+    '-3/-4',
+    '--3color/--4color',
+    'threecolor',
+    default=True,
+    help='Enable 3-color mode for non-black pixels. Higher quality, but slightly slower.',
+)
 def encode_bc1(level, black, threecolor, **kwargs):
    """Encode images to BC1 (RGB, no alpha)."""
    color_mode = quicktex.s3tc.bc1.BC1Encoder.ColorMode
@ -109,10 +177,23 @@ def encode_bc1(level, black, threecolor, **kwargs):


@click.command('bc3')
-@click.option('-l', '--level', type=click.IntRange(0, 18), default=18, help='Quality level to use. Higher values = higher quality, but slower.')
-def encode_bc3(level, **kwargs):
+@click.option(
+    '-l',
+    '--level',
+    type=click.IntRange(0, 18),
+    default=18,
+    help='Quality level to use. Higher values = higher quality, but slower.',
+)
+@click.option(
+    '-n/-N',
+    '--normal/--no-normal',
+    type=bool,
+    default=False,
+    help='Perform a BC3nm swizzle, copying the red channel into the alpha [default: no-normal]',
+)
+def encode_bc3(level, normal, **kwargs):
    """Encode images to BC4 (RGBA, 8-bit interpolated alpha)."""
-    encode_format.callback(quicktex.s3tc.bc3.BC3Encoder(level), 'DXT5', **kwargs)
+    encode_format.callback(quicktex.s3tc.bc3.BC3Encoder(level), 'DXT5', swizzle=normal, **kwargs)


@click.command('bc4')
--- a/quicktex/dds.py
+++ b/quicktex/dds.py
@ -4,12 +4,14 @@ import enum
 import os
 import struct
 import typing
+
+from PIL import Image
+
 import quicktex.image_utils
 import quicktex.s3tc.bc1 as bc1
 import quicktex.s3tc.bc3 as bc3
 import quicktex.s3tc.bc4 as bc4
 import quicktex.s3tc.bc5 as bc5
-from PIL import Image


 class DDSFormat:
@ -165,8 +167,28 @@ class DDSFile:
            file.write(DDSFile.magic)

            # WRITE HEADER
-            file.write(struct.pack('<7I44x', DDSFile.header_bytes, int(self.flags), self.size[1], self.size[0], self.pitch, self.depth, self.mipmap_count))
-            file.write(struct.pack('<2I4s5I', 32, int(self.pf_flags), bytes(self.four_cc, 'ascii'), self.pixel_size, *self.pixel_bitmasks))
+            file.write(
+                struct.pack(
+                    '<7I44x',
+                    DDSFile.header_bytes,
+                    int(self.flags),
+                    self.size[1],
+                    self.size[0],
+                    self.pitch,
+                    self.depth,
+                    self.mipmap_count,
+                )
+            )
+            file.write(
+                struct.pack(
+                    '<2I4s5I',
+                    32,
+                    int(self.pf_flags),
+                    bytes(self.four_cc, 'ascii'),
+                    self.pixel_size,
+                    *self.pixel_bitmasks,
+                )
+            )
            file.write(struct.pack('<4I4x', *self.caps))

            assert file.tell() == 4 + DDSFile.header_bytes, 'error writing file: incorrect header size'
@ -253,6 +275,7 @@ def read(path: os.PathLike) -> DDSFile:
 def encode(image: Image.Image, encoder, four_cc: str, mip_count: typing.Optional[int] = None) -> DDSFile:
    if image.mode != 'RGBA' or image.mode != 'RGBX':
        mode = 'RGBA' if 'A' in image.mode else 'RGBX'
+        image.apply_transparency()  # why is this necessary what
        image = image.convert(mode)

    sizes = quicktex.image_utils.mip_sizes(image.size, mip_count)
--- a/quicktex/image_utils.py
+++ b/quicktex/image_utils.py
@ -1,8 +1,9 @@
 """Various utilities for working with Pillow images"""

-from PIL import Image
-from typing import List, Tuple, Optional
 import math
+from typing import List, Tuple, Optional
+
+from PIL import Image


 def mip_sizes(dimensions: Tuple[int, int], mip_count: Optional[int] = None) -> List[Tuple[int, int]]:
--- a/quicktex/s3tc/_bindings.cpp
+++ b/quicktex/s3tc/_bindings.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/BC1Block.cpp
+++ b/quicktex/s3tc/bc1/BC1Block.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/BC1Block.h
+++ b/quicktex/s3tc/bc1/BC1Block.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/BC1Decoder.cpp
+++ b/quicktex/s3tc/bc1/BC1Decoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/BC1Decoder.h
+++ b/quicktex/s3tc/bc1/BC1Decoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/BC1Encoder.cpp
+++ b/quicktex/s3tc/bc1/BC1Encoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/BC1Encoder.h
+++ b/quicktex/s3tc/bc1/BC1Encoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/Histogram.h
+++ b/quicktex/s3tc/bc1/Histogram.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/OrderTable.cpp
+++ b/quicktex/s3tc/bc1/OrderTable.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/OrderTable.h
+++ b/quicktex/s3tc/bc1/OrderTable.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

@ -58,7 +58,7 @@ template <size_t N> class OrderTable {
    static bool Generate() {
        static_assert(N == 4 || N == 3);

-        table_mutex.lock();
+        std::scoped_lock{table_mutex};
        if (!generated) {
            hashes = new std::array<Hash, HashCount>();
            factors = new std::array<Vector4, OrderCount>();
@ -85,8 +85,6 @@ template <size_t N> class OrderTable {

            generated = true;
        }
-        table_mutex.unlock();
-
        assert(generated);
        return true;
    }
--- a/quicktex/s3tc/bc1/OrderTable4.cpp
+++ b/quicktex/s3tc/bc1/OrderTable4.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/SingleColorTable.h
+++ b/quicktex/s3tc/bc1/SingleColorTable.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc1/_bindings.cpp
+++ b/quicktex/s3tc/bc1/_bindings.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc3/BC3Block.h
+++ b/quicktex/s3tc/bc3/BC3Block.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc3/BC3Decoder.cpp
+++ b/quicktex/s3tc/bc3/BC3Decoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc3/BC3Decoder.h
+++ b/quicktex/s3tc/bc3/BC3Decoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc3/BC3Encoder.cpp
+++ b/quicktex/s3tc/bc3/BC3Encoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc3/BC3Encoder.h
+++ b/quicktex/s3tc/bc3/BC3Encoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc3/_bindings.cpp
+++ b/quicktex/s3tc/bc3/_bindings.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc4/BC4Block.cpp
+++ b/quicktex/s3tc/bc4/BC4Block.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc4/BC4Block.h
+++ b/quicktex/s3tc/bc4/BC4Block.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc4/BC4Decoder.cpp
+++ b/quicktex/s3tc/bc4/BC4Decoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc4/BC4Decoder.h
+++ b/quicktex/s3tc/bc4/BC4Decoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc4/BC4Encoder.cpp
+++ b/quicktex/s3tc/bc4/BC4Encoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc4/BC4Encoder.h
+++ b/quicktex/s3tc/bc4/BC4Encoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc4/_bindings.cpp
+++ b/quicktex/s3tc/bc4/_bindings.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc5/BC5Block.h
+++ b/quicktex/s3tc/bc5/BC5Block.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc5/BC5Decoder.cpp
+++ b/quicktex/s3tc/bc5/BC5Decoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc5/BC5Decoder.h
+++ b/quicktex/s3tc/bc5/BC5Decoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc5/BC5Encoder.cpp
+++ b/quicktex/s3tc/bc5/BC5Encoder.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc5/BC5Encoder.h
+++ b/quicktex/s3tc/bc5/BC5Encoder.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/bc5/_bindings.cpp
+++ b/quicktex/s3tc/bc5/_bindings.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/interpolator/Interpolator.cpp
+++ b/quicktex/s3tc/interpolator/Interpolator.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/interpolator/Interpolator.h
+++ b/quicktex/s3tc/interpolator/Interpolator.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/quicktex/s3tc/interpolator/_bindings.cpp
+++ b/quicktex/s3tc/interpolator/_bindings.cpp
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com> and licenced under the public domain

    This program is free software: you can redistribute it and/or modify
--- a/quicktex/util.h
+++ b/quicktex/util.h
@ -1,5 +1,5 @@
 /*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
+    Copyright (C) 2021-2022 Andrew Cassidy <drewcassidy@me.com>
    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
    and licenced under the public domain

--- a/setup.py
+++ b/setup.py
@ -1,9 +1,9 @@
 import os
 import re
-import sys
 import subprocess
-import pybind11
+import sys

+import pybind11
 from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext

@ -22,6 +22,7 @@ class CMakeExtension(Extension):
 class CMakeBuild(build_ext):
    def build_extension(self, ext):
        from setuptools_scm import get_version
+
        version = get_version(root='.', relative_to=__file__)

        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
@ -30,7 +31,9 @@ class CMakeBuild(build_ext):
        if not extdir.endswith(os.path.sep):
            extdir += os.path.sep

-        cfg = "Debug" if self.debug else "Release"
+        cfg = "Debug" if self.debug else "RelWithDebInfo"
+        if 'QUICKTEX_DEBUG' in os.environ:
+            cfg = "Debug"

        # CMake lets you override the generator - we need to check this.
        # Can be set with Conda-Build, for example.
@ -42,10 +45,12 @@ class CMakeBuild(build_ext):
            "-Dpybind11_DIR={}".format(pybind11.get_cmake_dir()),
            "-DPython_EXECUTABLE={}".format(sys.executable),
            "-DPython_ROOT_DIR={}".format(os.path.dirname(sys.executable)),
-            "-DQUICKTEX_VERSION_INFO={}".format(version),
+            "-DQUICKTEX_VERSION_INFO={}".format(version),  # include version info in module
+            "-DQUICKTEX_MODULE_ONLY=TRUE",  # only build the module, not the wrapper
            "-DCMAKE_BUILD_TYPE={}".format(cfg),  # not used on MSVC, but no harm
            # clear cached make program binary, see https://github.com/pypa/setuptools/issues/2912
-            "-U", "CMAKE_MAKE_PROGRAM",
+            "-U",
+            "CMAKE_MAKE_PROGRAM",
        ]
        build_args = []

@ -66,12 +71,7 @@ class CMakeBuild(build_ext):
            contains_arch = any(x in cmake_generator for x in {"ARM", "Win64"})

            # Convert distutils Windows platform specifiers to CMake -A arguments
-            plat_to_cmake = {
-                "win32": "Win32",
-                "win-amd64": "x64",
-                "win-arm32": "ARM",
-                "win-arm64": "ARM64",
-            }
+            plat_to_cmake = {"win32": "Win32", "win-amd64": "x64", "win-arm32": "ARM", "win-arm64": "ARM64"}

            # Specify the arch if using MSVC generator, but only if it doesn't
            # contain a backward-compatibility arch spec already in the
@ -81,9 +81,7 @@ class CMakeBuild(build_ext):

            # Multi-config generators have a different way to specify configs
            if not single_config:
-                cmake_args += [
-                    "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir)
-                ]
+                cmake_args += ["-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}".format(cfg.upper(), extdir)]
                build_args += ["--config", cfg]

        if sys.platform.startswith("darwin"):
@ -104,18 +102,10 @@ class CMakeBuild(build_ext):
        if not os.path.exists(self.build_temp):
            os.makedirs(self.build_temp)

-        subprocess.check_call(
-            ["cmake", ext.sourcedir] + cmake_args, cwd=self.build_temp
-        )
-        subprocess.check_call(
-            ["cmake", "--build", ".", "--target", ext.name] + build_args, cwd=self.build_temp
-        )
+        subprocess.check_call(["cmake", ext.sourcedir] + cmake_args, cwd=self.build_temp)
+        subprocess.check_call(["cmake", "--build", ".", "--target", ext.name] + build_args, cwd=self.build_temp)


 # The information here can also be placed in setup.cfg - better separation of
 # logic and declaration, and simpler if you include description/version in a file.
-setup(
-    use_scm_version=True,
-    ext_modules=[CMakeExtension("_quicktex")],
-    cmdclass={"build_ext": CMakeBuild},
-)
+setup(use_scm_version=True, ext_modules=[CMakeExtension("_quicktex")], cmdclass={"build_ext": CMakeBuild})
--- a/tests/run_tests.cpp
+++ b/tests/run_tests.cpp
@ -1,44 +0,0 @@
-/*  Quicktex Texture Compression Library
-    Copyright (C) 2021 Andrew Cassidy <drewcassidy@me.com>
-    Partially derived from rgbcx.h written by Richard Geldreich <richgel99@gmail.com>
-    and licenced under the public domain
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// This file allows for easy debugging in CLion or other IDEs that dont natively support cross-debugging between Python and C++
-
-#include <pybind11/embed.h>
-
-#include <array>
-#include <string>
-
-namespace py = pybind11;
-using namespace pybind11::literals;
-
-#define STRINGIFY(x) #x
-#define MACRO_STRINGIFY(x) STRINGIFY(x)
-
-int main() {
-    py::scoped_interpreter guard{};
-
-    py::module_ site = py::module_::import("site");
-
-    site.attr("addsitedir")(CUSTOM_SYS_PATH);
-
-    py::module_ nose = py::module_::import("nose");
-    py::module_ tests = py::module_::import("tests");
-    py::list argv(1);
-    nose.attr("runmodule")("name"_a = "tests.test_bc1", "exit"_a = false);
-}
--- a/tests/test_bc1.py
+++ b/tests/test_bc1.py
@ -1,208 +1,206 @@
-import unittest
-from parameterized import parameterized, parameterized_class
-from quicktex.s3tc.bc1 import BC1Block, BC1Texture, BC1Encoder, BC1Decoder
-from .images import BC1Blocks
+import math
+
+import pytest
 from PIL import Image, ImageChops

-in_endpoints = ((253, 254, 255), (65, 70, 67))  # has some small changes that should encode the same
+from quicktex.s3tc.bc1 import BC1Block, BC1Texture, BC1Encoder, BC1Decoder
+from .images import BC1Blocks
+
+in_endpoints = ((253, 254, 255), (65, 70, 67))  # has some small changes that should encode the same in 5:6:5
 out_endpoints = ((255, 255, 255, 255), (66, 69, 66, 255))
 selectors = [[0, 2, 3, 1]] * 4
 block_bytes = b'\xff\xff\x28\x42\x78\x78\x78\x78'


-class TestBC1Block(unittest.TestCase):
+class TestBC1Block:
    """Tests for the BC1Block class"""

    def test_size(self):
        """Test the size and dimensions of BC1Block"""
-        self.assertEqual(BC1Block.nbytes, 8, 'incorrect block size')
-        self.assertEqual(BC1Block.width, 4, 'incorrect block width')
-        self.assertEqual(BC1Block.height, 4, 'incorrect block width')
-        self.assertEqual(BC1Block.size, (4, 4), 'incorrect block dimensions')
+        assert BC1Block.nbytes == 8
+        assert BC1Block.width == 4
+        assert BC1Block.height == 4
+        assert BC1Block.size == (4, 4)

    def test_buffer(self):
        """Test the buffer protocol of BC1Block"""
        block = BC1Block()
        mv = memoryview(block)
-
-        self.assertFalse(mv.readonly, 'buffer is readonly')
-        self.assertTrue(mv.c_contiguous, 'buffer is not contiguous')
-        self.assertEqual(mv.ndim, 1, 'buffer is multidimensional')
-        self.assertEqual(mv.nbytes, BC1Block.nbytes, 'buffer is the wrong size')
-        self.assertEqual(mv.format, 'B', 'buffer has the wrong format')
-
        mv[:] = block_bytes
-        self.assertEqual(mv.tobytes(), block_bytes, 'incorrect buffer data')
+
+        assert not mv.readonly
+        assert mv.c_contiguous
+        assert mv.ndim == 1
+        assert mv.nbytes == 8
+        assert mv.format == 'B'
+        assert mv.tobytes() == block_bytes
+        assert mv.tobytes() == block.tobytes()

    def test_constructor(self):
        """Test constructing a block out of endpoints and selectors"""
        block = BC1Block(*in_endpoints, selectors)
-        self.assertEqual(block.tobytes(), block_bytes, 'incorrect block bytes')
-        self.assertEqual(block.selectors, selectors, 'incorrect selectors')
-        self.assertEqual(block.endpoints, out_endpoints, 'incorrect endpoints')
-        self.assertFalse(block.is_3color, 'incorrect color mode')
+        assert block.tobytes() == block_bytes
+        assert block.selectors == selectors
+        assert block.endpoints == out_endpoints
+        assert not block.is_3color

    def test_frombytes(self):
        """Test constructing a block out of raw data"""
        block = BC1Block.frombytes(block_bytes)
-        self.assertEqual(block.tobytes(), block_bytes, 'incorrect block bytes')
-        self.assertEqual(block.selectors, selectors, 'incorrect selectors')
-        self.assertEqual(block.endpoints, out_endpoints, 'incorrect endpoints')
-        self.assertFalse(block.is_3color, 'incorrect color mode')
+        assert block.tobytes() == block_bytes
+        assert block.selectors == selectors
+        assert block.endpoints == out_endpoints
+        assert not block.is_3color

    def test_eq(self):
        """Test equality between two identical blocks"""
        block1 = BC1Block.frombytes(block_bytes)
        block2 = BC1Block.frombytes(block_bytes)
-        self.assertEqual(block1, block2, 'identical blocks not equal')
+        assert block1 == block2


-@parameterized_class(
-    ("name", "w", "h", "wb", "hb"), [
-        ("8x8", 8, 8, 2, 2),
-        ("9x9", 9, 9, 3, 3),
-        ("7x7", 7, 7, 2, 2),
-        ("7x9", 7, 9, 2, 3)
-    ])
-class TestBC1Texture(unittest.TestCase):
-    def setUp(self):
-        self.tex = BC1Texture(self.w, self.h)
-        self.nbytes = self.wb * self.hb * BC1Block.nbytes
+# noinspection PyMethodMayBeStatic
+@pytest.mark.parametrize('w', [7, 8, 9])
+@pytest.mark.parametrize('h', [7, 8, 9])
+class TestBC1Texture:
+    def test_dimensions(self, w, h):
+        """Test dimensions of BC1Texture in pixels, blocks, and bytes"""
+        tex = BC1Texture(w, h)
+        wb = math.ceil(w / 4)
+        hb = math.ceil(h / 4)

-    def test_size(self):
-        """Test size of BC1Texture in bytes"""
-        self.assertEqual(self.tex.nbytes, self.nbytes, 'incorrect texture size')
-        self.assertEqual(len(self.tex.tobytes()), self.nbytes, 'incorrect texture size from tobytes')
+        assert tex.nbytes == BC1Block.nbytes * wb * hb  # block width x block height
+        assert len(tex.tobytes()) == tex.nbytes

-    def test_dimensions(self):
-        """Test dimensions of BC1Texture in pixels"""
-        self.assertEqual(self.tex.width, self.w, 'incorrect texture width')
-        self.assertEqual(self.tex.height, self.h, 'incorrect texture height')
-        self.assertEqual(self.tex.size, (self.w, self.h), 'incorrect texture dimensions')
+        assert tex.width == w
+        assert tex.height == h
+        assert tex.size == (w, h)

-    def test_dimensions_blocks(self):
-        """Test dimensions of BC1Texture in blocks"""
-        self.assertEqual(self.tex.width_blocks, self.wb, 'incorrect texture width_blocks')
-        self.assertEqual(self.tex.height_blocks, self.hb, 'incorrect texture width_blocks')
-        self.assertEqual(self.tex.size_blocks, (self.wb, self.hb), 'incorrect texture dimensions_blocks')
+        assert tex.width_blocks == wb
+        assert tex.height_blocks == hb
+        assert tex.size_blocks == (wb, hb)

-    def test_blocks(self):
+    def test_blocks(self, w, h):
        """Test getting and setting blocks to BC1Texture"""
-        blocks = [[BC1Block.frombytes(bytes([x, y] + [0] * 6)) for x in range(self.wb)] for y in range(self.hb)]
-        for x in range(self.wb):
-            for y in range(self.hb):
-                self.tex[x, y] = blocks[y][x]
+        tex = BC1Texture(w, h)

-        b = self.tex.tobytes()
-        for x in range(self.wb):
-            for y in range(self.hb):
-                index = (x + (y * self.wb)) * BC1Block.nbytes
-                tb = self.tex[x, y]
-                fb = BC1Block.frombytes(b[index:index + BC1Block.nbytes])
-                self.assertEqual(tb, blocks[y][x], 'incorrect block read from texture')
-                self.assertEqual(fb, blocks[y][x], 'incorrect block read from texture bytes')
+        # generate garbage blocks with the x and y index in the first 2 bytes
+        blocks = [
+            [BC1Block.frombytes(bytes([x, y] + [0] * 6)) for x in range(tex.width_blocks)]
+            for y in range(tex.height_blocks)
+        ]
+        # assign those blocks to the texture
+        for x in range(tex.width_blocks):
+            for y in range(tex.height_blocks):
+                tex[x, y] = blocks[y][x]

-        self.assertEqual(self.tex[-1, -1], self.tex[self.wb - 1, self.hb - 1], 'incorrect negative subscripting')
+        # get the blocks and analyze
+        b = tex.tobytes()
+        for x in range(tex.width_blocks):
+            for y in range(tex.height_blocks):
+                index = (x + (y * tex.width_blocks)) * BC1Block.nbytes
+                tb = tex[x, y]
+                fb = BC1Block.frombytes(b[index : index + BC1Block.nbytes])
+                assert tb == blocks[y][x]
+                assert fb == blocks[y][x]

-        with self.assertRaises(IndexError):
-            _ = self.tex[self.wb, self.hb]
-        with self.assertRaises(IndexError):
-            _ = self.tex[-1 - self.wb, -1 - self.hb]
+    def text_subscript(self, w, h):
+        """Test BC1Texture subscripting for blocks"""
+        tex = BC1Texture(w, h)

-    def test_buffer(self):
+        # ensure negative wraparound works
+        assert tex[-1, -1] == tex[tex.width_blocks - 1, tex.height_blocks - 1]
+
+        with pytest.raises(IndexError):
+            _ = tex[tex.width_blocks, tex.height_blocks]
+        with pytest.raises(IndexError):
+            _ = tex[-1 - tex.width_blocks, -1 - tex.height_blocks]
+
+    def test_buffer(self, w, h):
        """Test the buffer protocol of BC1Texture"""
-        mv = memoryview(self.tex)
+        tex = BC1Texture(w, h)
+        mv = memoryview(tex)

-        self.assertFalse(mv.readonly, 'buffer is readonly')
-        self.assertTrue(mv.c_contiguous, 'buffer is not contiguous')
-        self.assertEqual(mv.nbytes, self.nbytes, 'buffer is the wrong size')
-        self.assertEqual(mv.format, 'B', 'buffer has the wrong format')
-
-        data = block_bytes * self.wb * self.hb
+        data = block_bytes * tex.width_blocks * tex.height_blocks
        mv[:] = data
-        self.assertEqual(mv.tobytes(), data, 'incorrect buffer data')
+
+        assert not mv.readonly
+        assert mv.c_contiguous
+        assert mv.nbytes == tex.nbytes
+        assert mv.format == 'B'
+        assert mv.tobytes() == data


-@parameterized_class(
-    ("name", "color_mode"), [
-        ("4Color", BC1Encoder.ColorMode.FourColor),
-        ("3Color", BC1Encoder.ColorMode.ThreeColor),
-        ("3Color_Black", BC1Encoder.ColorMode.ThreeColorBlack),
-    ])
-class TestBC1Encoder(unittest.TestCase):
+@pytest.mark.parametrize(
+    'color_mode',
+    [BC1Encoder.ColorMode.FourColor, BC1Encoder.ColorMode.ThreeColor, BC1Encoder.ColorMode.ThreeColorBlack],
+)
+class TestBC1Encoder:
    """Test BC1Encoder"""

-    @classmethod
-    def setUpClass(cls):
-        cls.bc1_encoder = BC1Encoder(5, cls.color_mode)
-
-    def test_block_4color(self):
+    def test_block_4color(self, color_mode):
        """Test encoder output with 4 color greyscale test block"""
-        out_tex = self.bc1_encoder.encode(BC1Blocks.greyscale.texture)
-
-        self.assertEqual(out_tex.size_blocks, (1, 1), 'encoded texture has multiple blocks')
-
+        encoder = BC1Encoder(color_mode=color_mode)
+        out_tex = encoder.encode(BC1Blocks.greyscale.texture)
        out_block = out_tex[0, 0]

-        self.assertFalse(out_block.is_3color, 'returned 3color mode for greyscale test block')
-        self.assertEqual(out_block, BC1Blocks.greyscale.block, 'encoded block is incorrect')
+        assert out_tex.size_blocks == (1, 1)

-    def test_block_3color(self):
+        assert not out_block.is_3color
+        assert out_block == BC1Blocks.greyscale.block
+
+    def test_block_3color(self, color_mode):
        """Test encoder output with 3 color test block"""
-        out_tex = self.bc1_encoder.encode(BC1Blocks.three_color.texture)
-
-        self.assertEqual(out_tex.size_blocks, (1, 1), 'encoded texture has multiple blocks')
-
+        encoder = BC1Encoder(color_mode=color_mode)
+        out_tex = encoder.encode(BC1Blocks.three_color.texture)
        out_block = out_tex[0, 0]

-        if self.color_mode != BC1Encoder.ColorMode.FourColor:
+        assert out_tex.size_blocks == (1, 1)
+
+        if encoder.color_mode != BC1Encoder.ColorMode.FourColor:
            # we only care about the selectors if we are in 3 color mode
-            self.assertTrue(out_block.is_3color, 'returned 4-color block for 3 color test block')
-            self.assertEqual(out_block, BC1Blocks.three_color.block, 'encoded block is incorrect')
+            assert out_block.is_3color
+            assert out_block == BC1Blocks.three_color.block
        else:
-            self.assertFalse(out_block.is_3color, 'returned 3-color block in 4-color mode')
+            assert not out_block.is_3color

-    def test_block_3color_black(self):
+    def test_block_3color_black(self, color_mode):
        """Test encoder output with 3 color test block with black pixels"""
-        out_tex = self.bc1_encoder.encode(BC1Blocks.three_color_black.texture)
-
-        self.assertEqual(out_tex.size_blocks, (1, 1), 'encoded texture has multiple blocks')
-
+        encoder = BC1Encoder(color_mode=color_mode)
+        out_tex = encoder.encode(BC1Blocks.three_color_black.texture)
        out_block = out_tex[0, 0]
+
+        assert out_tex.size_blocks == (1, 1)
+
        has_black = 3 in [j for row in out_block.selectors for j in row]

-        if self.color_mode == BC1Encoder.ColorMode.ThreeColorBlack:
+        if color_mode == BC1Encoder.ColorMode.ThreeColorBlack:
            # we only care about the selectors if we are in 3 color black mode
-            self.assertTrue(out_block.is_3color, 'returned 4-color block for 3 color test block with black')
-            self.assertTrue(has_black, 'block does not have black pixels as expected')
-            self.assertEqual(out_block, BC1Blocks.three_color_black.block, "encoded block is incorrect")
-        elif self.color_mode == BC1Encoder.ColorMode.ThreeColor:
-            self.assertFalse(has_black and out_block.is_3color, 'returned 3color block with black pixels')
+            assert out_block.is_3color
+            assert has_black
+            assert out_block == BC1Blocks.three_color_black.block
+        elif color_mode == BC1Encoder.ColorMode.ThreeColor:
+            assert not (has_black and out_block.is_3color)
        else:
-            self.assertFalse(out_block.is_3color, 'returned 3-color block in 4-color mode')
+            assert not out_block.is_3color


-class TestBC1Decoder(unittest.TestCase):
+@pytest.mark.parametrize('texture', [BC1Blocks.greyscale, BC1Blocks.three_color, BC1Blocks.three_color_black])
+class TestBC1Decoder:
    """Test BC1Decoder"""

-    @classmethod
-    def setUpClass(cls):
-        cls.bc1_decoder = BC1Decoder()
-
-    @parameterized.expand([
-        ("4color", BC1Blocks.greyscale.block, BC1Blocks.greyscale.image),
-        ("3color", BC1Blocks.three_color.block, BC1Blocks.three_color.image),
-        ("3color_black", BC1Blocks.three_color_black.block, BC1Blocks.three_color_black.image)
-    ])
-    def test_block(self, _, block, image):
+    def test_block(self, texture):
        """Test decoder output for a single block"""
+        block = texture.block
+        image = texture.image
+        decoder = BC1Decoder()
        in_tex = BC1Texture(4, 4)
        in_tex[0, 0] = block
-        out_tex = self.bc1_decoder.decode(in_tex)
+        out_tex = decoder.decode(in_tex)

-        self.assertEqual(out_tex.size, (4, 4), 'decoded texture has incorrect dimensions')
+        assert out_tex.size == (4, 4)

        out_img = Image.frombytes('RGBA', (4, 4), out_tex.tobytes())
        img_diff = ImageChops.difference(out_img, image).convert('L')
        img_hist = img_diff.histogram()
-        self.assertEqual(16, img_hist[0], 'decoded block is incorrect')
+        assert img_hist[0] == 16
--- a/tests/test_bc4.py
+++ b/tests/test_bc4.py
@ -1,179 +1,179 @@
-import unittest
-from parameterized import parameterized, parameterized_class
-from quicktex.s3tc.bc4 import BC4Block, BC4Texture, BC4Encoder, BC4Decoder
-from .images import BC4Blocks
+import math
+
+import pytest
 from PIL import Image, ImageChops

+from quicktex.s3tc.bc4 import BC4Block, BC4Texture, BC4Encoder, BC4Decoder
+from .images import BC4Blocks

-class TestBC4Block(unittest.TestCase):
+block_bytes = b'\xF0\x10\x88\x86\x68\xAC\xCF\xFA'
+selectors = [[0, 1, 2, 3]] * 2 + [[4, 5, 6, 7]] * 2
+endpoints = (240, 16)
+
+
+class TestBC4Block:
    """Tests for the BC1Block class"""
-    block_bytes = b'\xF0\x10\x88\x86\x68\xAC\xCF\xFA'
-    selectors = [[0, 1, 2, 3]] * 2 + [[4, 5, 6, 7]] * 2
-    endpoints = (240, 16)

    def test_size(self):
        """Test the size and dimensions of BC4Block"""
-        self.assertEqual(BC4Block.nbytes, 8, 'incorrect block size')
-        self.assertEqual(BC4Block.width, 4, 'incorrect block width')
-        self.assertEqual(BC4Block.height, 4, 'incorrect block width')
-        self.assertEqual(BC4Block.size, (4, 4), 'incorrect block dimensions')
+        assert BC4Block.nbytes == 8
+        assert BC4Block.width == 4
+        assert BC4Block.height == 4
+        assert BC4Block.size == (4, 4)

    def test_buffer(self):
        """Test the buffer protocol of BC4Block"""
        block = BC4Block()
        mv = memoryview(block)
+        mv[:] = block_bytes

-        self.assertFalse(mv.readonly, 'buffer is readonly')
-        self.assertTrue(mv.c_contiguous, 'buffer is not contiguous')
-        self.assertEqual(mv.ndim, 1, 'buffer is multidimensional')
-        self.assertEqual(mv.nbytes, BC4Block.nbytes, 'buffer is the wrong size')
-        self.assertEqual(mv.format, 'B', 'buffer has the wrong format')
-
-        mv[:] = self.block_bytes
-        self.assertEqual(mv.tobytes(), self.block_bytes, 'incorrect buffer data')
+        assert not mv.readonly
+        assert mv.c_contiguous
+        assert mv.ndim == 1
+        assert mv.nbytes == 8
+        assert mv.format == 'B'
+        assert mv.tobytes() == block_bytes
+        assert mv.tobytes() == block.tobytes()

    def test_constructor(self):
        """Test constructing a block out of endpoints and selectors"""
-        block = BC4Block(*self.endpoints, self.selectors)
-        self.assertEqual(block.tobytes(), self.block_bytes, 'incorrect block bytes')
-        self.assertEqual(block.selectors, self.selectors, 'incorrect selectors')
-        self.assertEqual(block.endpoints, self.endpoints, 'incorrect endpoints')
+        block = BC4Block(*endpoints, selectors)
+        assert block.tobytes() == block_bytes
+        assert block.selectors == selectors
+        assert block.endpoints == endpoints

    def test_frombytes(self):
        """Test constructing a block out of raw data"""
-        block = BC4Block.frombytes(self.block_bytes)
-        self.assertEqual(block.tobytes(), self.block_bytes, 'incorrect block bytes')
-        self.assertEqual(block.selectors, self.selectors, 'incorrect selectors')
-        self.assertEqual(block.endpoints, self.endpoints, 'incorrect endpoints')
+        block = BC4Block.frombytes(block_bytes)
+        assert block.tobytes() == block_bytes
+        assert block.selectors == selectors
+        assert block.endpoints == endpoints

    def test_eq(self):
        """Test equality between two identical blocks"""
-        block1 = BC4Block.frombytes(self.block_bytes)
-        block2 = BC4Block.frombytes(self.block_bytes)
-        self.assertEqual(block1, block2, 'identical blocks not equal')
+        block1 = BC4Block.frombytes(block_bytes)
+        block2 = BC4Block.frombytes(block_bytes)
+        assert block1 == block2

    def test_values_6(self):
        """Test values of a 6-value block"""
        block = BC4Block(8, 248, [[0] * 4] * 4)

-        self.assertEqual(block.values, [8, 248, 56, 104, 152, 200, 0, 255], 'incorrect values')
-        self.assertTrue(block.is_6value, 'incorrect is_6value')
+        assert block.values == [8, 248, 56, 104, 152, 200, 0, 255]
+        assert block.is_6value

    def test_values_8(self):
        """Test values of an 8-value block"""
        block = BC4Block(240, 16, [[0] * 4] * 4)

-        self.assertEqual(block.values, [240, 16, 208, 176, 144, 112, 80, 48], 'incorrect values')
-        self.assertFalse(block.is_6value, 'incorrect is_6value')
+        assert block.values == [240, 16, 208, 176, 144, 112, 80, 48]
+        assert not block.is_6value


-@parameterized_class(
-    ("name", "w", "h", "wb", "hb"), [
-        ("8x8", 8, 8, 2, 2),
-        ("9x9", 9, 9, 3, 3),
-        ("7x7", 7, 7, 2, 2),
-        ("7x9", 7, 9, 2, 3)
-    ])
-class TestBC4Texture(unittest.TestCase):
-    def setUp(self):
-        self.tex = BC4Texture(self.w, self.h)
-        self.nbytes = self.wb * self.hb * BC4Block.nbytes
+# noinspection PyMethodMayBeStatic
+@pytest.mark.parametrize('w', [7, 8, 9])
+@pytest.mark.parametrize('h', [7, 8, 9])
+class TestBC4Texture:
+    def test_dimensions(self, w, h):
+        """Test dimensions of BC4Texture in pixels, blocks, and bytes"""
+        tex = BC4Texture(w, h)
+        wb = math.ceil(w / 4)
+        hb = math.ceil(h / 4)

-    def test_size(self):
-        """Test size of BC4Texture in bytes"""
-        self.assertEqual(self.tex.nbytes, self.nbytes, 'incorrect texture size')
-        self.assertEqual(len(self.tex.tobytes()), self.nbytes, 'incorrect texture size from tobytes')
+        assert tex.nbytes == BC4Block.nbytes * wb * hb  # block width x block height
+        assert len(tex.tobytes()) == tex.nbytes

-    def test_dimensions(self):
-        """Test dimensions of BC4Texture in pixels"""
-        self.assertEqual(self.tex.width, self.w, 'incorrect texture width')
-        self.assertEqual(self.tex.height, self.h, 'incorrect texture height')
-        self.assertEqual(self.tex.size, (self.w, self.h), 'incorrect texture dimensions')
+        assert tex.width == w
+        assert tex.height == h
+        assert tex.size == (w, h)

-    def test_dimensions_blocks(self):
-        """Test dimensions of BC4Texture in blocks"""
-        self.assertEqual(self.tex.width_blocks, self.wb, 'incorrect texture width_blocks')
-        self.assertEqual(self.tex.height_blocks, self.hb, 'incorrect texture width_blocks')
-        self.assertEqual(self.tex.size_blocks, (self.wb, self.hb), 'incorrect texture dimensions_blocks')
+        assert tex.width_blocks == wb
+        assert tex.height_blocks == hb
+        assert tex.size_blocks == (wb, hb)

-    def test_blocks(self):
+    def test_blocks(self, w, h):
        """Test getting and setting blocks to BC4Texture"""
-        blocks = [[BC4Block.frombytes(bytes([x, y] + [0] * 6)) for x in range(self.wb)] for y in range(self.hb)]
-        for x in range(self.wb):
-            for y in range(self.hb):
-                self.tex[x, y] = blocks[y][x]
+        tex = BC4Texture(w, h)

-        b = self.tex.tobytes()
-        for x in range(self.wb):
-            for y in range(self.hb):
-                index = (x + (y * self.wb)) * BC4Block.nbytes
-                tb = self.tex[x, y]
-                fb = BC4Block.frombytes(b[index:index + BC4Block.nbytes])
-                self.assertEqual(tb, blocks[y][x], 'incorrect block read from texture')
-                self.assertEqual(fb, blocks[y][x], 'incorrect block read from texture bytes')
+        # generate garbage blocks with the x and y index in the first 2 bytes
+        blocks = [
+            [BC4Block.frombytes(bytes([x, y] + [0] * 6)) for x in range(tex.width_blocks)]
+            for y in range(tex.height_blocks)
+        ]
+        # assign those blocks to the texture
+        for x in range(tex.width_blocks):
+            for y in range(tex.height_blocks):
+                tex[x, y] = blocks[y][x]

-        self.assertEqual(self.tex[-1, -1], self.tex[self.wb - 1, self.hb - 1], 'incorrect negative subscripting')
+        # get the blocks and analyze
+        b = tex.tobytes()
+        for x in range(tex.width_blocks):
+            for y in range(tex.height_blocks):
+                index = (x + (y * tex.width_blocks)) * BC4Block.nbytes
+                tb = tex[x, y]
+                fb = BC4Block.frombytes(b[index : index + BC4Block.nbytes])
+                assert tb == blocks[y][x]
+                assert fb == blocks[y][x]

-        with self.assertRaises(IndexError):
-            _ = self.tex[self.wb, self.hb]
-        with self.assertRaises(IndexError):
-            _ = self.tex[-1 - self.wb, -1 - self.hb]
+    def text_subscript(self, w, h):
+        """Test BC4Texture subscripting for blocks"""
+        tex = BC4Texture(w, h)

-    def test_buffer(self):
-        """Test the buffer protocol of BC4Texture"""
-        mv = memoryview(self.tex)
+        # ensure negative wraparound works
+        assert tex[-1, -1] == tex[tex.width_blocks - 1, tex.height_blocks - 1]

-        self.assertFalse(mv.readonly, 'buffer is readonly')
-        self.assertTrue(mv.c_contiguous, 'buffer is not contiguous')
-        self.assertEqual(mv.nbytes, self.nbytes, 'buffer is the wrong size')
-        self.assertEqual(mv.format, 'B', 'buffer has the wrong format')
+        with pytest.raises(IndexError):
+            _ = tex[tex.width_blocks, tex.height_blocks]
+        with pytest.raises(IndexError):
+            _ = tex[-1 - tex.width_blocks, -1 - tex.height_blocks]

-        data = b'\xF0\x10\x88\x86\x68\xAC\xCF\xFA' * self.wb * self.hb
+    def test_buffer(self, w, h):
+        """Test the buffer protocol of BC1Texture"""
+        tex = BC4Texture(w, h)
+        mv = memoryview(tex)
+
+        data = block_bytes * tex.width_blocks * tex.height_blocks
        mv[:] = data
-        self.assertEqual(mv.tobytes(), data, 'incorrect buffer data')
+
+        assert not mv.readonly
+        assert mv.c_contiguous
+        assert mv.nbytes == tex.nbytes
+        assert mv.format == 'B'
+        assert mv.tobytes() == data


-class TestBC4Encoder(unittest.TestCase):
+class TestBC4Encoder:
    """Test BC4Encoder"""

-    # 6-value blocks are not yet supported by the encoder so we only run one test
-    @classmethod
-    def setUpClass(cls):
-        cls.bc4_encoder = BC4Encoder(0)
-
    def test_block(self):
        """Test encoder output with 8 value test block"""
-        out_tex = self.bc4_encoder.encode(BC4Blocks.eight_value.texture)
-
-        self.assertEqual(out_tex.size_blocks, (1, 1), 'encoded texture has multiple blocks')
-
+        encoder = BC4Encoder(0)
+        out_tex = encoder.encode(BC4Blocks.eight_value.texture)
        out_block = out_tex[0, 0]

-        self.assertFalse(out_block.is_6value, 'returned 6value mode')
-        self.assertEqual(out_block, BC4Blocks.eight_value.block, 'encoded block is incorrect')
+        assert out_tex.size_blocks == (1, 1)
+
+        assert not out_block.is_6value
+        assert out_block == BC4Blocks.eight_value.block


-class TestBC4Decoder(unittest.TestCase):
+@pytest.mark.parametrize('texture', [BC4Blocks.eight_value, BC4Blocks.six_value])
+class TestBC4Decoder:
    """Test BC4Decoder"""

-    @classmethod
-    def setUpClass(cls):
-        cls.bc4_decoder = BC4Decoder(0)
-
-    @parameterized.expand([
-        ("8value", BC4Blocks.eight_value.block, BC4Blocks.eight_value.image),
-        ("6value", BC4Blocks.six_value.block, BC4Blocks.six_value.image),
-    ])
-    def test_block(self, _, block, image):
+    def test_block(self, texture):
        """Test decoder output for a single block"""
+        block = texture.block
+        image = texture.image
+        decoder = BC4Decoder(0)
        in_tex = BC4Texture(4, 4)
        in_tex[0, 0] = block
-        out_tex = self.bc4_decoder.decode(in_tex)
+        out_tex = decoder.decode(in_tex)

-        self.assertEqual(out_tex.size, (4, 4), 'decoded texture has incorrect dimensions')
+        assert out_tex.size == (4, 4)

        out_img = Image.frombytes('RGBA', (4, 4), out_tex.tobytes())
        img_diff = ImageChops.difference(out_img, image).convert('L')
        img_hist = img_diff.histogram()

-        self.assertEqual(16, img_hist[0], 'decoded block is incorrect')
+        assert img_hist[0] == 16
--- a/tests/test_install.py
+++ b/tests/test_install.py
@ -1,13 +1,9 @@
 """Test if everything is installed correctly"""

-import unittest
-import os.path
 import quicktex

-tests_path = os.path.dirname(os.path.realpath(__file__))

-
-class TestInstall(unittest.TestCase):
+class TestInstall:
    def test_version(self):
        """Test if the extension module version matches what setuptools returns"""
        try:
--- a/tests/test_texture.py
+++ b/tests/test_texture.py
@ -1,58 +1,60 @@
-import unittest
 import os.path
-from .images import image_path
-from quicktex import RawTexture
+
+import pytest
 from PIL import Image

+from quicktex import RawTexture
+from .images import image_path

-class TestRawTexture(unittest.TestCase):
+
+class TestRawTexture:
    boilerplate = Image.open(os.path.join(image_path, 'Boilerplate.png'))
    boilerplate_bytes = boilerplate.tobytes('raw', 'RGBX')
    width, height = boilerplate.size
-    size = width * height * 4
-
-    def setUp(self):
-        self.tex = RawTexture(self.width, self.height)
+    nbytes = width * height * 4

    def test_size(self):
        """Test byte size and image dimensions"""
-        self.assertEqual(self.tex.nbytes, self.size, "incorrect texture byte size")
-        self.assertEqual(self.tex.width, self.width, "incorrect texture width")
-        self.assertEqual(self.tex.height, self.height, "incorrect texture height")
-        self.assertEqual(self.tex.size, (self.width, self.height), "incorrect texture dimensions")
+        tex = RawTexture(self.width, self.height)
+        assert tex.nbytes == self.nbytes
+        assert tex.width == self.width
+        assert tex.height == self.height
+        assert tex.size == (self.width, self.height)

    def test_pixels(self):
        """Test getting and setting pixel values"""
+        tex = RawTexture(self.width, self.height)
        color1 = (69, 13, 12, 0)  # totally random color
        color2 = (19, 142, 93, 44)

-        self.tex[0, 0] = color1
-        self.tex[-1, -1] = color2
-        data = self.tex.tobytes()
+        tex[0, 0] = color1
+        tex[-1, -1] = color2
+        data = tex.tobytes()

-        self.assertEqual(self.tex[0, 0], color1)
-        self.assertEqual(self.tex[-1, -1], color2)
-        self.assertEqual(tuple(data[0:4]), color1)
-        self.assertEqual(tuple(data[-4:]), color2)
+        assert tex[0, 0] == color1
+        assert tex[-1, -1] == color2
+        assert tuple(data[0:4]) == color1
+        assert tuple(data[-4:]) == color2

-        with self.assertRaises(IndexError):
-            thing = self.tex[self.width, self.height]
-        with self.assertRaises(IndexError):
-            thing = self.tex[-1 - self.width, -1 - self.height]
+        with pytest.raises(IndexError):
+            _ = tex[self.width, self.height]
+        with pytest.raises(IndexError):
+            _ = tex[-1 - self.width, -1 - self.height]

    def test_buffer(self):
        """Test the Buffer protocol implementation for RawTexture"""
-        mv = memoryview(self.tex)
-
-        self.assertFalse(mv.readonly, 'buffer is readonly')
-        self.assertTrue(mv.c_contiguous, 'buffer is not contiguous')
-        self.assertEqual(mv.nbytes, self.size, 'buffer is the wrong size')
-        self.assertEqual(mv.format, 'B', 'buffer has the wrong format')
-
+        tex = RawTexture(self.width, self.height)
+        mv = memoryview(tex)
        mv[:] = self.boilerplate_bytes
-        self.assertEqual(mv.tobytes(), self.boilerplate_bytes, 'incorrect buffer data')
+
+        assert not mv.readonly
+        assert mv.c_contiguous
+        assert mv.nbytes == self.nbytes
+        assert mv.format == 'B'
+        assert mv.tobytes() == self.boilerplate_bytes
+        assert mv.tobytes() == tex.tobytes()

    def test_frombytes(self):
        """Test the frombytes factory function"""
        bytetex = RawTexture.frombytes(self.boilerplate_bytes, *self.boilerplate.size)
-        self.assertEqual(self.boilerplate_bytes, bytetex.tobytes(), 'Incorrect bytes after writing to buffer')
+        assert self.boilerplate_bytes == bytetex.tobytes()
Author	SHA1	Message	Date
Andrew Cassidy	a05c1e352e	Release 0.2.1 ### Fixed - Fixed broken transparency on palettized PNG files ### Changed - Changed which wheels are built by the CI. There are no changes to OS or Python version compatibility if you compile from source. - Stopped building Python 3.7 wheels - Stopped building macOS universal wheels - Wheels for macOS now require macOS 12 or later - Included macOS ARM wheels - Included Python 3.12 wheels	2024-06-02 18:58:48 -07:00
Andrew Cassidy	1f7aad7218	skip python3.7 because its EOL Still supported for now, just no wheels provided	2024-06-02 17:56:13 -07:00
Andrew Cassidy	23133eb802	Fix build matrix and macOS target	2024-06-02 17:43:33 -07:00
Andrew Cassidy	0448dbe6e1	Update CIBuildWheel	2024-06-02 17:32:00 -07:00
Andrew Cassidy	ec7953dcff	Release 0.2.0 ### Changed - Updated Pybind11 to version 3.10, adding Python 3.11 support - Updated install instructions in readme to reflect availability on PyPI - Encode now skips .dds files in its input to prevent needless re-encoding ### Added - Added the `-n` option for bc3 encoding to perform a BC3nm swizzle	2023-06-21 15:46:13 -07:00
Andrew Cassidy	3280fc74be	Merge branch 'dev'	2023-06-21 15:45:35 -07:00
Andrew Cassidy	cbec93ed55	Skip any dds files when encoding	2023-06-21 15:41:08 -07:00
Andrew Cassidy	8509384bff	Add -n option to `encode bc3` which performs a BC3nm swizzle	2023-06-21 15:32:24 -07:00
Andrew Cassidy	1c86b09ca0	Fix docs link	2023-06-21 15:31:47 -07:00
Andrew Cassidy	d4eada16f9	Update readme with easier install directions	2023-06-21 15:11:17 -07:00
Andrew Cassidy	aed575edc6	Release 0.1.4 ### Changed - Updated Pybind11 to version 3.10, adding Python 3.11 support	2022-10-29 23:32:05 -07:00
Andrew Cassidy	4cdcb65f3a	Merge branch 'dev'	2022-10-29 23:31:45 -07:00
Andrew Cassidy	0a66fcca20	Merge pull request #35 from drewcassidy/dependabot/github_actions/dev/pypa/cibuildwheel-2.11.2 Bump pypa/cibuildwheel from 2.5.0 to 2.11.2	2022-10-29 22:13:20 -07:00
Andrew Cassidy	37f0673e95	Merge pull request #33 from drewcassidy/dependabot/github_actions/dev/actions/setup-python-4.3.0 Bump actions/setup-python from 4.0.0 to 4.3.0	2022-10-29 22:12:59 -07:00
Andrew Cassidy	b81df96990	track python dependencies	2022-10-29 21:55:53 -07:00
dependabot[bot]	38beffef05	Bump pypa/cibuildwheel from 2.5.0 to 2.11.2 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.5.0 to 2.11.2. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/2.5.0...v2.11.2) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-29 21:05:59 -07:00
Andrew Cassidy	0dccd1cd07	Update pybind to 3.10 to allow Python 3.11 support	2022-10-29 21:03:12 -07:00
dependabot[bot]	7ea104f712	Bump actions/setup-python from 4.0.0 to 4.3.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.0.0 to 4.3.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4.0.0...v4.3.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-10 12:46:28 +00:00
Andrew Cassidy	9cb60f0ce2	Merge pull request #21 from drewcassidy/dependabot/github_actions/dev/actions/setup-python-4.0.0 Bump actions/setup-python from 3.1.2 to 4.0.0	2022-06-12 18:02:11 -07:00
Andrew Cassidy	15e0c68df6	Merge branch 'dev' into dependabot/github_actions/dev/actions/setup-python-4.0.0	2022-06-12 17:18:18 -07:00
Andrew Cassidy	9f54349556	Specify python versions	2022-06-12 17:16:18 -07:00
dependabot[bot]	71c069d30c	Bump actions/setup-python from 3.1.2 to 4.0.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3.1.2 to 4.0.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v3.1.2...v4.0.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-09 11:32:38 +00:00
Andrew Cassidy	661536e6f6	use scoped lock	2022-05-22 20:59:37 -07:00
Andrew Cassidy	920059bea1	Migrate tests to pytest	2022-05-22 18:40:13 -07:00
Andrew Cassidy	daae86cf50	Switch to pytest	2022-05-22 16:50:24 -07:00
Andrew Cassidy	5c87c82702	Add file documenting development environment setup	2022-05-11 23:22:51 -07:00
Andrew Cassidy	ddbeff43cb	Update copyright year	2022-05-11 20:51:35 -07:00
Andrew Cassidy	5c94782876	Remove debug wrapper, now that I know how to use a debug python build	2022-05-10 22:08:01 -07:00
Andrew Cassidy	9eaaf901f3	Fix compilation of test wrapper	2022-05-08 16:06:36 -07:00
dependabot[bot]	c79ffc8794	Bump docker/setup-qemu-action from 1 to 2 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-06 18:33:39 -07:00
Andrew Cassidy	55f0ced229	getting started instructions	2022-05-04 23:29:28 -07:00
Andrew Cassidy	eb7b259d53	Autogenerated command documentation from helpstrings	2022-05-04 23:03:06 -07:00
Andrew Cassidy	03801e2e1b	New index page and remove broken page	2022-05-04 22:51:40 -07:00
Andrew Cassidy	3a28ec690c	Merge remote-tracking branch 'origin/dependabot/github_actions/pypa/cibuildwheel-2.5.0' into dev	2022-05-02 22:42:11 -07:00
Andrew Cassidy	697f7243a0	Documentation nice-to-haves	2022-05-02 22:41:39 -07:00
Andrew Cassidy	22e1455ceb	tell dependabot to target the dev branch	2022-05-02 22:26:05 -07:00
dependabot[bot]	c13f64828f	Bump pypa/cibuildwheel from 2.4.0 to 2.5.0 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.4.0...2.5.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-02 11:41:47 +00:00
Andrew Cassidy	9a57b096f5	Set min version for sphinx tools	2022-04-21 09:34:21 -07:00
Andrew Cassidy	82f079f1b6	Enable RTD building	2022-04-19 21:55:00 -07:00
Andrew Cassidy	2c72b7ad22	Ignore previous commit in blames	2022-04-18 19:56:41 -07:00
Andrew Cassidy	cb84f32eda	Migrate code style to Black	2022-04-18 19:53:26 -07:00
Andrew Cassidy	b34fdf2316	Ignore wheels and sdists	2022-04-16 22:40:54 -07:00