Skip to content

Commit

Permalink
workaround for ruamel.yaml changes
Browse files Browse the repository at this point in the history
  • Loading branch information
grahampugh committed Feb 8, 2024
1 parent fa70fcb commit 7756b7d
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 9 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ All notable changes to this project will be documented in this file. This projec

Changes since last release will be listed here.

## [v0.6.4] - 2022-06-21 - v0.6.4

- Fixed the installation of ruamel.yaml if not already present.
- Limit the ruamel.yaml version to less than 0.18.0, because newer versions are completely changed so will need more work to fix. Note that if you already have a newer version of ruamel.yaml in the python that you are using, it is advised to run the following command to remove it, after which running this script will reinstall a working version:

```
/path/to/your/python -m pip uninstall ruamel.yaml
```

## [v0.6.3] - 2022-06-21 - v0.6.3

Expand Down Expand Up @@ -58,7 +65,8 @@ Changes since last release will be listed here.

- Initial Release (though the tool has been around for some time).

[unreleased]: https://github.com/grahampugh/plist-yaml-plist/compare/v0.6.3...HEAD
[unreleased]: https://github.com/grahampugh/plist-yaml-plist/compare/v0.6.4...HEAD
[v0.6.4]: https://github.com/grahampugh/plist-yaml-plist/compare/v0.6.3...v0.6.4
[v0.6.3]: https://github.com/grahampugh/plist-yaml-plist/compare/v0.6.1...v0.6.3
[v0.6.1]: https://github.com/grahampugh/plist-yaml-plist/compare/v0.6.0...v0.6.1
[v0.6.0]: https://github.com/grahampugh/plist-yaml-plist/compare/v0.5.0...v0.6.0
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ It can also convert `json` files to `plist`.

## Prerequisites

The python `ruamel.yaml` module is required, which is not installed by default on Macs. You can install it with `pip`, which you may also need to install first. A few other things need to be updated for ruamel to install:
The python `ruamel.yaml` module is required, which is not installed by default on Macs. The version of ruamel.yaml currently must be lower than 0.18.0. You can install it with `pip`, which you may also need to install first. A few other things need to be updated for ruamel to install:

```bash
python -m ensurepip --user
python -m pip install -U pip setuptools wheel ruamel.yaml --user
python -m pip install -U pip setuptools wheel ruamel.yaml<0.18.0 --user
```

If you do not pre-install `ruamel.yaml`, the script will do it for you.
Expand Down
4 changes: 2 additions & 2 deletions pkg/plistyamlplist/build-info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<key>install_location</key>
<string>/</string>
<key>name</key>
<string>plistyamlplist-0.6.3.pkg</string>
<string>plistyamlplist-0.6.4.pkg</string>
<key>ownership</key>
<string>recommended</string>
<key>postinstall_action</key>
<string>none</string>
<key>suppress_bundle_relocation</key>
<true/>
<key>version</key>
<string>0.6.3</string>
<string>0.6.4</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion plistyamlplist_lib/plist_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"pip",
"setuptools",
"wheel",
"ruamel.yaml",
"ruamel.yaml<0.18.0",
"--user",
]
)
Expand Down
2 changes: 1 addition & 1 deletion plistyamlplist_lib/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.6.3"
__version__ = "0.6.4"
2 changes: 1 addition & 1 deletion plistyamlplist_lib/yaml_plist.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"pip",
"setuptools",
"wheel",
"ruamel.yaml",
"ruamel.yaml<0.18.0",
"--user",
]
)
Expand Down
2 changes: 1 addition & 1 deletion plistyamlplist_lib/yaml_tidy.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pip",
"setuptools",
"wheel",
"ruamel.yaml",
"ruamel.yaml<0.18.0",
"--user",
]
)
Expand Down

0 comments on commit 7756b7d

Please sign in to comment.