Skip to content

Commit

Permalink
Fix merge conflict after markdown notes merge (#1567)
Browse files Browse the repository at this point in the history
  • Loading branch information
torarnv authored Jun 8, 2024
1 parent d56f3c7 commit 1873972
Showing 1 changed file with 12 additions and 20 deletions.
32 changes: 12 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,18 @@ If you want to work on osxphotos code or contribute to the project, you can inst
git clone https://github.com/RhetTbull/osxphotos.git
cd osxphotos

**NOTE** The git repo for this project is very large (> 3GB) because it contains multiple Photos libraries used for testing on different versions of macOS. If you just want to use the osxphotos package in your own code, I recommend you install the latest version from [PyPI](https://pypi.org/project/osxphotos/) which does not include all the test libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest [release](https://github.com/RhetTbull/osxphotos/releases) or you can install via `pip` which also installs the command line app. If you aren't comfortable with running python on your Mac, start with the pre-built executable or `pipx` as described above. Alternatively, to clone the repository
without the test data:

git clone --filter=blob:none --no-checkout --sparse https://github.com/RhetTbull/osxphotos.git
cd osxphotos
git sparse-checkout set --no-cone '/*' '!tests'
git checkout
> [!NOTE]
> The git repo for this project is very large (> 3GB) because it contains multiple Photos libraries used for testing on different versions of macOS.
>
> If you just want to use the osxphotos package in your own code, I recommend you install the latest version from [PyPI](https://pypi.org/project/osxphotos/) which does not include all the test libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest [release](https://github.com/RhetTbull/osxphotos/releases) or you can install via `pip` which also installs the command line app. If you aren't comfortable with running python on your Mac, start with the pre-built executable or `pipx` as described above.
>
> Alternatively, to clone the repository without the test data:
>
> git clone --filter=blob:none --no-checkout --sparse https://github.com/RhetTbull/osxphotos.git
> cd osxphotos
> git sparse-checkout set --no-cone '/*' '!tests'
> git checkout
>
Next, install the required dependencies, and `osxphotos` itself. I recommend you create a
[virtual environment](https://docs.python.org/3/tutorial/venv.html) before installing osxphotos.
Expand All @@ -126,19 +131,6 @@ Next, install the required dependencies, and `osxphotos` itself. I recommend you
python3 -m pip install -r requirements.txt
python3 -m pip install -e .

I recommend you create a [virtual environment](https://docs.python.org/3/tutorial/venv.html) before installing osxphotos.

> [!NOTE]
> The git repo for this project is very large (> 3GB) because it contains multiple Photos libraries used for testing on different versions of macOS. If you just want to use the osxphotos package in your own code, I recommend you install the latest version from [PyPI](https://pypi.org/project/osxphotos/) which does not include all the test libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest [release](https://github.com/RhetTbull/osxphotos/releases) or you can install via `pip` which also installs the command line app. If you aren't comfortable with running python on your Mac, start with the pre-built executable or `pipx` as described above. Alternatively, to clone the repository without the test data:
git clone --filter=blob:none --no-checkout --sparse https://github.com/RhetTbull/osxphotos.git
cd osxphotos
git sparse-checkout set --no-cone '/*' '!tests'
git checkout

Next, install the required dependencies, and `osxphotos` itself. I recommend you create a
[virtual environment](https://docs.python.org/3/tutorial/venv.html) before installing osxphotos.

Once you've installed osxphotos via the git repository, to upgrade to the latest version:

cd osxphotos
Expand Down

0 comments on commit 1873972

Please sign in to comment.