Skip to content

Commit

Permalink
Merge pull request #739
Browse files Browse the repository at this point in the history
v4.1.11
  • Loading branch information
MatteoCampinoti94 authored Nov 11, 2024
2 parents 9b8804c + 7852588 commit e2f7009
Show file tree
Hide file tree
Showing 7 changed files with 149 additions and 135 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## v4.1.11

### Changes

* Use acacore 3.3.2

## v4.1.10

### Fixes
Expand Down
2 changes: 1 addition & 1 deletion digiarch/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "4.1.10"
__version__ = "4.1.11"
243 changes: 118 additions & 125 deletions poetry.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "digiarch"
version = "4.1.10"
version = "4.1.11"
description = "Tools for the Digital Archive Project at Aarhus Stadsarkiv"
authors = ["Aarhus Stadsarkiv <[email protected]>"]
license = "GPL-3.0"
Expand All @@ -12,10 +12,10 @@ include = ["pyproject.toml"]

[tool.poetry.dependencies]
python = "^3.11"
acacore = {git = "https://github.com/aarhusstadsarkiv/acacore.git", tag = "v3.3.1"}
patool = "^2.4.0"
acacore = {git = "https://github.com/aarhusstadsarkiv/acacore.git", tag = "v3.3.2"}
patool = "^3.0.3"
tnefparse = "^1.4.0"
extract-msg = "^0.49.0"
extract-msg = "^0.52.0"
chardet = "^5.2.0"

[tool.poetry.group.dev.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tests/custom_signatures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
extension: .map
- puid: aca-fmt/18
signature: OpenDocument Text (unspecified version)
bof: (?i)^504B0304{26}6D696D65747970656170706C69636174696F6E2F766E642E6F617369732E6F70656E646F63756D656E742E74657874
bof: (?i)^504B0304.{52}6D696D65747970656170706C69636174696F6E2F766E642E6F617369732E6F70656E646F63756D656E742E74657874
extension: .odt
- puid: aca-fmt/19
signature: Lotus Approach View File
Expand Down
23 changes: 19 additions & 4 deletions tests/fileformats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1009,8 +1009,7 @@ fmt/292:
name: OpenDocument Presentation 1.1
action: convert
convert:
tool: document
output: odt
tool: copy
fmt/294:
name: OpenDocument Spreadsheet 1.1
action: convert
Expand All @@ -1022,13 +1021,13 @@ fmt/295:
convert:
tool: copy
fmt/296:
name: OpenDocument Graphics
name: OpenDocument Graphics 1.1
action: convert
convert:
tool: document
output: svg
fmt/297:
name: OpenDocument Graphics
name: OpenDocument Graphics 1.2
action: convert
convert:
tool: document
Expand Down Expand Up @@ -1945,6 +1944,22 @@ fmt/1516:
convert:
tool: document
output: pdf
fmt/1753:
name: OpenDocument Graphics 1.3
action: convert
convert:
tool: document
output: svg
fmt/1754:
name: OpenDocument Presentation 1.3
action: convert
convert:
tool: copy
fmt/1755:
name: OpenDocument Spreadsheet 1.3
action: convert
convert:
tool: copy
fmt/1566:
name: ColdFusion Markup Language
action: ignore
Expand Down
Binary file modified tests/files/_metadata/files.db
Binary file not shown.

0 comments on commit e2f7009

Please sign in to comment.