From a80e7a127bc72967abd8330ca77fe8a46afcfb17 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 20 Jun 2023 01:37:26 -0700 Subject: [PATCH] Fix some references to master not renamed to main --- .github/workflows/build.yml | 8 ++++---- docs/advanced.rst | 2 +- docs/installation.rst | 4 ++-- docs/languages.rst | 2 +- src/ocrmypdf/_exec/unpaper.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b23ee147..9bed58ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: Test and deploy on: push: branches: - - master + - main - ci - release/* - feature/* @@ -249,7 +249,7 @@ jobs: name: artifact path: dist - - uses: pypa/gh-action-pypi-publish@master + - uses: pypa/gh-action-pypi-publish@main with: user: __token__ password: ${{ secrets.TOKEN_PYPI }} @@ -264,9 +264,9 @@ jobs: - name: Set image tag to release or branch run: echo "DOCKER_IMAGE_TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV - - name: If master, set to latest + - name: If main, set to latest run: echo 'DOCKER_IMAGE_TAG=latest' >> $GITHUB_ENV - if: env.DOCKER_IMAGE_TAG == 'master' + if: env.DOCKER_IMAGE_TAG == 'main' - name: Set Docker Hub repository to username run: echo "DOCKER_REPOSITORY=jbarlow83" >> $GITHUB_ENV diff --git a/docs/advanced.rst b/docs/advanced.rst index f4297a6d..89567742 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -10,7 +10,7 @@ Control of unpaper OCRmyPDF uses ``unpaper`` to provide the implementation of the ``--clean`` and ``--clean-final`` arguments. -`unpaper `__ +`unpaper `__ provides a variety of image processing filters to improve images. By default, OCRmyPDF uses only ``unpaper`` arguments that were found to diff --git a/docs/installation.rst b/docs/installation.rst index a0117eaa..fe1a09e0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -637,7 +637,7 @@ system-wide: .. code-block:: bash - git clone -b master https://github.com/ocrmypdf/OCRmyPDF.git + git clone -b main https://github.com/ocrmypdf/OCRmyPDF.git python3 -m venv venv source venv/bin/activate cd OCRmyPDF @@ -664,7 +664,7 @@ To install all of the development and test requirements: .. code-block:: bash - git clone -b master https://github.com/ocrmypdf/OCRmyPDF.git + git clone -b main https://github.com/ocrmypdf/OCRmyPDF.git python -m venv source venv/bin/activate cd OCRmyPDF diff --git a/docs/languages.rst b/docs/languages.rst index ff9467c9..b2aa6cc2 100644 --- a/docs/languages.rst +++ b/docs/languages.rst @@ -12,7 +12,7 @@ OCRmyPDF uses Tesseract for OCR, and relies on its language packs for all langua On most platforms, English is installed with Tesseract by default, but not always. Tesseract supports `most -languages `__. +languages `__. Languages are identified by standardized three-letter codes (called ISO 639-2 Alpha-3). Tesseract's documentation also lists the three-letter code for your language. Some are anglicized, e.g. Spanish is ``spa`` rather than ``esp``, while others diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py index 9734f846..fb4ccd38 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py @@ -21,7 +21,7 @@ from ocrmypdf.exceptions import MissingDependencyError, SubprocessOutputError from ocrmypdf.subprocess import get_version, run # unpaper documentation: -# https://github.com/Flameeyes/unpaper/blob/master/doc/basic-concepts.md +# https://github.com/Flameeyes/unpaper/blob/main/doc/basic-concepts.md if sys.version_info >= (3, 10):