Skip to content

Commit

Permalink
[#367] Fixed DisplayCAL.argyll_instruments.remove_vendor_names() fo…
Browse files Browse the repository at this point in the history
…r `bytes` inputs.
  • Loading branch information
eoyilmaz committed Jun 5, 2024
1 parent edc14b9 commit 6e76545
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DisplayCAL/argyll_instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,5 +473,5 @@ def remove_vendor_names(txt):
)
elif isinstance(txt, str):
txt = re.sub(re.compile(re.escape(vendor) + r"\s*", re.I), "", txt)
txt = txt.strip()
txt = txt.strip()
return txt
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ commits that Florian has created after the ``3.8.9.3`` release on 14 Jan 2020.
Status Update (6 June 2024)
---------------------------

Windows version is now working!

DisplayCAL is in [PyPI](https://pypi.org/project/DisplayCAL/) now (yay!).

Here is a screenshots showing the tool working with Python 3.10:
Expand Down Expand Up @@ -103,19 +105,21 @@ Then you can build and install DisplayCAL using:
make build
make install
```
The build step assumes your system has a python3 binary available that is within the correct range. If your system python3 is not supported and you installed a new one, you can try passing it to the build command.
eg
The build step assumes your system has a `python3` binary available that is
within the correct range. If your system `python3` is not supported and you
installed a new one, you can try passing it to the build command:

```shell
$ python3 --version
# Python 3.12.2
make build # this will fail
$ make build # this will fail
$ python3.11 --version
# Python 3.11.8
make SYSTEM_PYTHON=python3.11 build # should work
$ make SYSTEM_PYTHON=python3.11 build # should work
```

If this errors out for you, you can follow the [Manual Setup](https://github.com/eoyilmaz/displaycal-py3#manually-setup)
If this errors out for you, you can follow the
[Manual Setup](https://github.com/eoyilmaz/displaycal-py3#manually-setup)
section below.

Otherwise, this should install DisplayCAL. To run the UI:
Expand Down

0 comments on commit 6e76545

Please sign in to comment.