diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf76ac..42b19db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All major and minor version changes will be documented in this file. Details of patch-level version changes can be found in [commit messages](../../commits/master). +## 2023 - 2023/08/31 + +- Update deps + ## 2022.0.1 2022/04/06 - Remove metprint diff --git a/documentation/reference/layeredimage/blend.md b/documentation/reference/layeredimage/blend.md index 13c21c0..16799da 100644 --- a/documentation/reference/layeredimage/blend.md +++ b/documentation/reference/layeredimage/blend.md @@ -5,5 +5,4 @@ Blend > Auto-generated documentation for [layeredimage.blend](../../../layeredimage/blend.py) module. - - [Blend](#blend) diff --git a/documentation/reference/layeredimage/io/common.md b/documentation/reference/layeredimage/io/common.md index a21460f..b436319 100644 --- a/documentation/reference/layeredimage/io/common.md +++ b/documentation/reference/layeredimage/io/common.md @@ -39,6 +39,4 @@ Return layers and throw a warning if the image has groups. ```python def expandLayersToCanvas(layeredImage: LayeredImage, imageFormat: str) -> list[Image]: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/gif.md b/documentation/reference/layeredimage/io/gif.md index 0de7ad1..6e40c01 100644 --- a/documentation/reference/layeredimage/io/gif.md +++ b/documentation/reference/layeredimage/io/gif.md @@ -37,6 +37,4 @@ Save a layered image as .gif. ```python def saveLayer_GIF(fileName: str, layeredImage: LayeredImage) -> None: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/layered.md b/documentation/reference/layeredimage/io/layered.md index 2c3eae4..a91362d 100644 --- a/documentation/reference/layeredimage/io/layered.md +++ b/documentation/reference/layeredimage/io/layered.md @@ -105,6 +105,4 @@ def writeImage_LAYERED( image: Image.Image, zipFile: ZipFile, path: str, compressed: bool = False ): ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/lsr.md b/documentation/reference/layeredimage/io/lsr.md index 3aebd5c..40e938b 100644 --- a/documentation/reference/layeredimage/io/lsr.md +++ b/documentation/reference/layeredimage/io/lsr.md @@ -37,6 +37,4 @@ Save a layered image as .lsr. ```python def saveLayer_LSR(fileName: str, layeredImage: LayeredImage) -> None: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/ora.md b/documentation/reference/layeredimage/io/ora.md index ff44ee6..92e2829 100644 --- a/documentation/reference/layeredimage/io/ora.md +++ b/documentation/reference/layeredimage/io/ora.md @@ -53,6 +53,4 @@ Save a layered image as .ora. ```python def saveLayer_ORA(fileName: str, layeredImage: LayeredImage) -> None: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/pdn.md b/documentation/reference/layeredimage/io/pdn.md index 251c0a3..bad4f36 100644 --- a/documentation/reference/layeredimage/io/pdn.md +++ b/documentation/reference/layeredimage/io/pdn.md @@ -37,6 +37,4 @@ Save a layered image as .pdn. ```python def saveLayer_PDN(fileName: str, layeredImage: LayeredImage) -> None: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/psd.md b/documentation/reference/layeredimage/io/psd.md index 6da03a4..0198e5d 100644 --- a/documentation/reference/layeredimage/io/psd.md +++ b/documentation/reference/layeredimage/io/psd.md @@ -37,6 +37,4 @@ Save a layered image as .psd. ```python def saveLayer_PSD(fileName: str, layeredImage: LayeredImage) -> None: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/tiff.md b/documentation/reference/layeredimage/io/tiff.md index 1b76356..50d21d5 100644 --- a/documentation/reference/layeredimage/io/tiff.md +++ b/documentation/reference/layeredimage/io/tiff.md @@ -37,6 +37,4 @@ Save a layered image as .tiff or .tif. ```python def saveLayer_TIFF(fileName: str, layeredImage: LayeredImage) -> None: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/webp.md b/documentation/reference/layeredimage/io/webp.md index c47c2aa..2794004 100644 --- a/documentation/reference/layeredimage/io/webp.md +++ b/documentation/reference/layeredimage/io/webp.md @@ -37,6 +37,4 @@ Save a layered image as .webp. ```python def saveLayer_WEBP(fileName: str, layeredImage: LayeredImage): ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/io/xcf.md b/documentation/reference/layeredimage/io/xcf.md index 9c2ec53..4dd0f08 100644 --- a/documentation/reference/layeredimage/io/xcf.md +++ b/documentation/reference/layeredimage/io/xcf.md @@ -37,6 +37,4 @@ Save a layered image as .xcf. ```python def saveLayer_XCF(fileName: str, layeredImage: LayeredImage) -> None: ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/layeredimage.md b/documentation/reference/layeredimage/layeredimage.md index b5420f4..ab972f9 100644 --- a/documentation/reference/layeredimage/layeredimage.md +++ b/documentation/reference/layeredimage/layeredimage.md @@ -358,6 +358,4 @@ def flattenLayerOrGroup( ignoreHidden: bool = True, ): ... -``` - - +``` \ No newline at end of file diff --git a/documentation/reference/layeredimage/layergroup.md b/documentation/reference/layeredimage/layergroup.md index 576a9ea..5e4c625 100644 --- a/documentation/reference/layeredimage/layergroup.md +++ b/documentation/reference/layeredimage/layergroup.md @@ -161,6 +161,4 @@ Get the object as a dict. ```python def json(self) -> dict[str, Any]: ... -``` - - +``` \ No newline at end of file diff --git a/layeredimage/io/psd.py b/layeredimage/io/psd.py index 93c2430..04a24ac 100644 --- a/layeredimage/io/psd.py +++ b/layeredimage/io/psd.py @@ -13,8 +13,8 @@ #### PSD #### def openLayer_PSD(file: str) -> LayeredImage: """Open a .psd file into a layered image.""" - from psdtoolsx import PSDImage - from psdtoolsx.constants import BlendMode as psdB + from psd_tools import PSDImage + from psd_tools.constants import BlendMode as psdB blendLookup = { psdB.NORMAL: BlendType.NORMAL, diff --git a/pyproject.toml b/pyproject.toml index 4288a14..ca4757b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "layeredimage" -version = "2022.0.1" +version = "2023" license = "mit" description = "Use this module to read, and write to a number of layered image formats" authors = ["FredHappyface"] @@ -23,21 +23,21 @@ readme = "README.md" [tool.poetry.dependencies] python = ">=3.8,<4.0" -blendmodes = "<2024,>=2022" -Pillow = "<10,>=9.0.0" -pylsr = "<2024,>=2022" +blendmodes = "<2025,>=2023" +pylsr = "<2025,>=2023" pyora = "<2,>=0.3.11" -gimpformats = "<2024,>=2022" pypdn = "<2,>=1.0.6" deprecation = "<3,>=2.1.0" -psdtoolsx = "<20,>=19.18.0" +psd-tools = "<2,>=1.9.28" +pillow = "<11,>=10.0.0" +gimpformats = "<2025,>=2023.1" -[tool.poetry.dev-dependencies] +[tool.poetry.group.dev.dependencies] imgcompare = "^2.0.1" -pytest = "^7.1.1" -pylint = "^2.13.5" -handsdown = "^1.1.0" -coverage = "^6.3.2" +pytest = "^7.4.0" +pylint = "^2.17.5" +handsdown = "^2.0.1" +coverage = "^7.3.0" [tool.black] line-length = 100 diff --git a/requirements.txt b/requirements.txt index 83ced11..3a5c06e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -Pillow<10,>=9.0.0 -blendmodes<2024,>=2022 +blendmodes<2025,>=2023 deprecation<3,>=2.1.0 -gimpformats<2024,>=2022 -psdtoolsx<20,>=19.18.0 -pylsr<2024,>=2022 +gimpformats<2025,>=2023.1 +pillow<11,>=10.0.0 +psd-tools<2,>=1.9.28 +pylsr<2025,>=2023 pyora<2,>=0.3.11 pypdn<2,>=1.0.6 diff --git a/tests/data/gif_output.ora b/tests/data/gif_output.ora index 9de7faa..1defefd 100644 Binary files a/tests/data/gif_output.ora and b/tests/data/gif_output.ora differ diff --git a/tests/data/layered_output.ora b/tests/data/layered_output.ora index 61f144b..c61978c 100644 Binary files a/tests/data/layered_output.ora and b/tests/data/layered_output.ora differ diff --git a/tests/data/layeredc_output.ora b/tests/data/layeredc_output.ora index a293b03..a58a0eb 100644 Binary files a/tests/data/layeredc_output.ora and b/tests/data/layeredc_output.ora differ diff --git a/tests/data/lsr_output.lsr b/tests/data/lsr_output.lsr index d944a3d..bade89f 100644 Binary files a/tests/data/lsr_output.lsr and b/tests/data/lsr_output.lsr differ diff --git a/tests/data/lsr_output.ora b/tests/data/lsr_output.ora index ce923b5..9abc33e 100644 Binary files a/tests/data/lsr_output.ora and b/tests/data/lsr_output.ora differ diff --git a/tests/data/ora_output.layered b/tests/data/ora_output.layered index 202e7fa..2beb7bf 100644 Binary files a/tests/data/ora_output.layered and b/tests/data/ora_output.layered differ diff --git a/tests/data/ora_output.layeredc b/tests/data/ora_output.layeredc index e173e60..87ab8c1 100644 Binary files a/tests/data/ora_output.layeredc and b/tests/data/ora_output.layeredc differ diff --git a/tests/data/ora_output.ora b/tests/data/ora_output.ora index 1559d7c..ac8a1aa 100644 Binary files a/tests/data/ora_output.ora and b/tests/data/ora_output.ora differ diff --git a/tests/data/pdn_output.ora b/tests/data/pdn_output.ora index b2e70f3..7d74a53 100644 Binary files a/tests/data/pdn_output.ora and b/tests/data/pdn_output.ora differ diff --git a/tests/data/psd_output.ora b/tests/data/psd_output.ora index aa14f2e..2003f4d 100644 Binary files a/tests/data/psd_output.ora and b/tests/data/psd_output.ora differ diff --git a/tests/data/tiff_output.ora b/tests/data/tiff_output.ora index cf306b1..a98c9ee 100644 Binary files a/tests/data/tiff_output.ora and b/tests/data/tiff_output.ora differ diff --git a/tests/data/webp_output.ora b/tests/data/webp_output.ora index 368a10c..47eed81 100644 Binary files a/tests/data/webp_output.ora and b/tests/data/webp_output.ora differ diff --git a/tests/data/xcf_output.ora b/tests/data/xcf_output.ora index 7a54b5b..649b38d 100644 Binary files a/tests/data/xcf_output.ora and b/tests/data/xcf_output.ora differ