Skip to content

Commit

Permalink
Add in next fixtures, prep for release
Browse files Browse the repository at this point in the history
  • Loading branch information
zimeon committed Apr 18, 2021
1 parent b1acf0e commit 6a7c5bb
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 55 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ocfl-py changelog

## 2021-??-?? v1.2.1
## 2021-04-18 v1.2.1

* Add use of `pylint` in addition to `pycodestyle` and `pydocstyle` (was `pep257`). Numerous minor fixes as a result of errors/warnings reported.
* Use additional fixtures in https://github.com/OCFL/fixtures for tests
Expand Down
32 changes: 16 additions & 16 deletions docs/demo_build_spec_examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ The digest type sha512-spec-ex is sha512 with most of the content stripped out a

```
> python ocfl-object.py --build --src fixtures/1.0/content/spec-ex-minimal --id http://example.org/minimal --digest sha512-spec-ex --created 2018-10-02T12:00:00Z --message One file --name Alice --address alice@example.org -v
WARNING:ocfl.object:### Inventory for v1
{
WARNING:ocfl.object:### Inventory for v1{
"digestAlgorithm": "sha512-spec-ex",
"head": "v1",
"id": "http://example.org/minimal",
Expand All @@ -37,6 +36,7 @@ WARNING:ocfl.object:### Inventory for v1
}
}
}
```


Expand All @@ -48,8 +48,7 @@ This is inventory should match the example with 3 versions in <https://ocfl.io/1

```
> python ocfl-object.py --build --src fixtures/1.0/content/spec-ex-full --id ark:/12345/bcd987 --fixity md5 --fixity sha1 --digest sha512-spec-ex -v
WARNING:ocfl.object:### Inventory for v1
{
WARNING:ocfl.object:### Inventory for v1{
"digestAlgorithm": "sha512-spec-ex",
"fixity": {
"md5": {
Expand Down Expand Up @@ -91,7 +90,7 @@ WARNING:ocfl.object:### Inventory for v1
"type": "https://ocfl.io/1.0/spec/#inventory",
"versions": {
"v1": {
"created": "2021-03-24T20:22:33.307165Z",
"created": "2021-04-18T15:14:51.784558Z",
"state": {
"7dcc352f96c56dc...c31": [
"foo/bar.xml"
Expand All @@ -106,8 +105,8 @@ WARNING:ocfl.object:### Inventory for v1
}
}
}
WARNING:ocfl.object:### Inventory for v2
{
WARNING:ocfl.object:### Inventory for v2{
"digestAlgorithm": "sha512-spec-ex",
"fixity": {
"md5": {
Expand Down Expand Up @@ -158,7 +157,7 @@ WARNING:ocfl.object:### Inventory for v2
"type": "https://ocfl.io/1.0/spec/#inventory",
"versions": {
"v1": {
"created": "2021-03-24T20:22:33.307165Z",
"created": "2021-04-18T15:14:51.784558Z",
"state": {
"7dcc352f96c56dc...c31": [
"foo/bar.xml"
Expand All @@ -172,7 +171,7 @@ WARNING:ocfl.object:### Inventory for v2
}
},
"v2": {
"created": "2021-03-24T20:22:33.308961Z",
"created": "2021-04-18T15:14:51.786202Z",
"state": {
"4d27c86b026ff70...b53": [
"foo/bar.xml"
Expand All @@ -185,8 +184,8 @@ WARNING:ocfl.object:### Inventory for v2
}
}
}
WARNING:ocfl.object:### Inventory for v3
{
WARNING:ocfl.object:### Inventory for v3{
"digestAlgorithm": "sha512-spec-ex",
"fixity": {
"md5": {
Expand Down Expand Up @@ -237,7 +236,7 @@ WARNING:ocfl.object:### Inventory for v3
"type": "https://ocfl.io/1.0/spec/#inventory",
"versions": {
"v1": {
"created": "2021-03-24T20:22:33.307165Z",
"created": "2021-04-18T15:14:51.784558Z",
"state": {
"7dcc352f96c56dc...c31": [
"foo/bar.xml"
Expand All @@ -251,7 +250,7 @@ WARNING:ocfl.object:### Inventory for v3
}
},
"v2": {
"created": "2021-03-24T20:22:33.308961Z",
"created": "2021-04-18T15:14:51.786202Z",
"state": {
"4d27c86b026ff70...b53": [
"foo/bar.xml"
Expand All @@ -263,7 +262,7 @@ WARNING:ocfl.object:### Inventory for v3
}
},
"v3": {
"created": "2021-03-24T20:22:33.310220Z",
"created": "2021-04-18T15:14:51.787447Z",
"state": {
"4d27c86b026ff70...b53": [
"foo/bar.xml"
Expand All @@ -278,6 +277,7 @@ WARNING:ocfl.object:### Inventory for v3
}
}
}
```


Expand All @@ -289,8 +289,7 @@ This is inventory should match the example showing how content paths may differ

```
> python ocfl-object.py --build --src fixtures/1.0/content/spec-ex-diff-paths --id http://example.org/diff-paths --digest sha512-spec-ex --normalization md5 --created 2019-03-14T20:31:00Z -v
WARNING:ocfl.object:### Inventory for v1
{
WARNING:ocfl.object:### Inventory for v1{
"digestAlgorithm": "sha512-spec-ex",
"head": "v1",
"id": "http://example.org/diff-paths",
Expand All @@ -317,5 +316,6 @@ WARNING:ocfl.object:### Inventory for v1
}
}
}
```

32 changes: 16 additions & 16 deletions docs/demo_ocfl_object_script.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The `--version` argument will show version number and exit

```
> python ocfl-object.py --version
ocfl-object.py is part of ocfl-py version 1.2.0
ocfl-object.py is part of ocfl-py version 1.2.1
```


Expand All @@ -22,8 +22,7 @@ Without an `--objdir` argument the script just writes out the inventory for the

```
> python ocfl-object.py --create --id http://example.org/obj1 --src fixtures/1.0/content/cf1/v1
WARNING:ocfl.object:### Inventory for v1
{
WARNING:ocfl.object:### Inventory for v1{
"digestAlgorithm": "sha512",
"head": "v1",
"id": "http://example.org/obj1",
Expand All @@ -35,7 +34,7 @@ WARNING:ocfl.object:### Inventory for v1
"type": "https://ocfl.io/1.0/spec/#inventory",
"versions": {
"v1": {
"created": "2021-03-24T20:22:34.576958Z",
"created": "2021-04-18T15:14:53.278161Z",
"state": {
"43a43fe8a8a082d3b5343dfaf2fd0c8b8e370675b1f376e92e9994612c33ea255b11298269d72f797399ebb94edeefe53df243643676548f584fb8603ca53a0f": [
"a_file.txt"
Expand All @@ -44,6 +43,7 @@ WARNING:ocfl.object:### Inventory for v1
}
}
}
```


Expand All @@ -53,8 +53,7 @@ Without an `--objdir` argument the script just writes out the inventory for each

```
> python ocfl-object.py --build --id http://example.org/obj2 --src fixtures/1.0/content/cf3
WARNING:ocfl.object:### Inventory for v1
{
WARNING:ocfl.object:### Inventory for v1{
"digestAlgorithm": "sha512",
"head": "v1",
"id": "http://example.org/obj2",
Expand All @@ -66,7 +65,7 @@ WARNING:ocfl.object:### Inventory for v1
"type": "https://ocfl.io/1.0/spec/#inventory",
"versions": {
"v1": {
"created": "2021-03-24T20:22:34.974946Z",
"created": "2021-04-18T15:14:53.721542Z",
"state": {
"43a43fe8a8a082d3b5343dfaf2fd0c8b8e370675b1f376e92e9994612c33ea255b11298269d72f797399ebb94edeefe53df243643676548f584fb8603ca53a0f": [
"a_file.txt"
Expand All @@ -75,8 +74,8 @@ WARNING:ocfl.object:### Inventory for v1
}
}
}
WARNING:ocfl.object:### Inventory for v2
{
WARNING:ocfl.object:### Inventory for v2{
"digestAlgorithm": "sha512",
"head": "v2",
"id": "http://example.org/obj2",
Expand All @@ -91,15 +90,15 @@ WARNING:ocfl.object:### Inventory for v2
"type": "https://ocfl.io/1.0/spec/#inventory",
"versions": {
"v1": {
"created": "2021-03-24T20:22:34.974946Z",
"created": "2021-04-18T15:14:53.721542Z",
"state": {
"43a43fe8a8a082d3b5343dfaf2fd0c8b8e370675b1f376e92e9994612c33ea255b11298269d72f797399ebb94edeefe53df243643676548f584fb8603ca53a0f": [
"a_file.txt"
]
}
},
"v2": {
"created": "2021-03-24T20:22:34.975605Z",
"created": "2021-04-18T15:14:53.722350Z",
"state": {
"296e72b8fd5f7f0ac1473993600ae34953d5dab646f17e7b182b8648aff830d7bf01b56490777cb3e72b33fcc1ae520506badea1032252d1a55fd7362e269975": [
"a_file.txt"
Expand All @@ -108,8 +107,8 @@ WARNING:ocfl.object:### Inventory for v2
}
}
}
WARNING:ocfl.object:### Inventory for v3
{
WARNING:ocfl.object:### Inventory for v3{
"digestAlgorithm": "sha512",
"head": "v3",
"id": "http://example.org/obj2",
Expand All @@ -124,23 +123,23 @@ WARNING:ocfl.object:### Inventory for v3
"type": "https://ocfl.io/1.0/spec/#inventory",
"versions": {
"v1": {
"created": "2021-03-24T20:22:34.974946Z",
"created": "2021-04-18T15:14:53.721542Z",
"state": {
"43a43fe8a8a082d3b5343dfaf2fd0c8b8e370675b1f376e92e9994612c33ea255b11298269d72f797399ebb94edeefe53df243643676548f584fb8603ca53a0f": [
"a_file.txt"
]
}
},
"v2": {
"created": "2021-03-24T20:22:34.975605Z",
"created": "2021-04-18T15:14:53.722350Z",
"state": {
"296e72b8fd5f7f0ac1473993600ae34953d5dab646f17e7b182b8648aff830d7bf01b56490777cb3e72b33fcc1ae520506badea1032252d1a55fd7362e269975": [
"a_file.txt"
]
}
},
"v3": {
"created": "2021-03-24T20:22:34.976141Z",
"created": "2021-04-18T15:14:53.723184Z",
"state": {
"43a43fe8a8a082d3b5343dfaf2fd0c8b8e370675b1f376e92e9994612c33ea255b11298269d72f797399ebb94edeefe53df243643676548f584fb8603ca53a0f": [
"a_file.txt"
Expand All @@ -149,6 +148,7 @@ WARNING:ocfl.object:### Inventory for v3
}
}
}
```


Expand Down
2 changes: 1 addition & 1 deletion docs/demo_ocfl_sidecar_script.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The `--version` argument will show version number and exit

```
> python ocfl-sidecar.py --version
ocfl-sidecar.py is part of ocfl-py version 1.2.0
ocfl-sidecar.py is part of ocfl-py version 1.2.1
```


Expand Down
2 changes: 1 addition & 1 deletion docs/demo_ocfl_store_script.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The `--version` argument will show version number and exit (but we still tave to

```
> python ocfl-store.py --version --root=tmp/root --list
ocfl-store.py is part of ocfl-py version 1.2.0
ocfl-store.py is part of ocfl-py version 1.2.1
```


Expand Down
8 changes: 4 additions & 4 deletions docs/demo_using_bagit_bags.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ Taking the newly created OCFL object `/tmp/obj` we can `--extract` the `v4` cont
INFO:ocfl.object:Extracted v4 into tmp/extracted_v4
INFO:bagit:Creating bag for directory tmp/extracted_v4
INFO:bagit:Creating data directory
INFO:bagit:Moving my_content to /privatetmp/extracted_v4/tmpmv9q6tbn/my_content
INFO:bagit:Moving /privatetmp/extracted_v4/tmpmv9q6tbn to data
INFO:bagit:Moving my_content to /privatetmp/extracted_v4/tmp1z_q233f/my_content
INFO:bagit:Moving /privatetmp/extracted_v4/tmp1z_q233f to data
INFO:bagit:Using 1 processes to generate manifests: sha512
INFO:bagit:Generating manifest lines for file data/my_content/dracula.txt
INFO:bagit:Generating manifest lines for file data/my_content/dunwich.txt
Expand All @@ -184,12 +184,12 @@ We note that the OCFL object had only one `content` file in `v4` but the extract
diff -r tmp/extracted_v4/bag-info.txt tests/testdata/bags/uaa_v4/bag-info.txt
1,2c1
< Bag-Software-Agent: bagit.py v1.8.1 <https://github.com/LibraryOfCongress/bagit-python>
< Bagging-Date: 2021-03-24
< Bagging-Date: 2021-04-18
---
> Bagging-Date: 2020-01-04
diff -r tmp/extracted_v4/tagmanifest-sha512.txt tests/testdata/bags/uaa_v4/tagmanifest-sha512.txt
2c2
< 4354c74d41f895abfcb617379a7a4114dcff7193a8f30ae27f8d5553fdecce4c533cfdf6f8f94ad2ab15adff22f0e5768ee8961f5ac6aa5156c79ae8a6642651 bag-info.txt
< b28abe8d128a679ebfa949ac900b4f63119d5734ab4cf60c102aacdf69f486cb69ff143a3f95d0be9d0d942ee7a69b7587d72abf61d2c281dc10d9f62b1b0339 bag-info.txt
---
> 10624e6d45462def7af66d1a0d977606c7b073b01809c1d42258cfab5c34a275480943cbe78044416aee1f23822cc3762f92247b8f39b5c6ddc5ae32a8f94ce5 bag-info.txt
```
Expand Down
Loading

0 comments on commit 6a7c5bb

Please sign in to comment.