diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e8c393ab4..934e1505a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,53 +61,9 @@ jobs: name: pypi_packages path: dist/* - build-n-publish-anaconda: - name: Build and publish anaconda packages - needs: lint_and_test - runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: conda-incubator/setup-miniconda@v3 - with: - python-version: 3.9 - miniforge-variant: Mambaforge - - name: install dependencies build - shell: bash -l {0} - run: mamba install colorama pip ruamel ruamel.yaml rich jsonschema conda-verify anaconda-client - - name: Build linux-64 conda package - uses: prefix-dev/rattler-build-action@v0.2.6 - with: - recipe-path: "conda/recipe.yaml" - build-args: "--experimental --target-platform linux-64" - - name: Build osx-64 conda package - uses: prefix-dev/rattler-build-action@v0.2.6 - with: - recipe-path: "conda/recipe.yaml" - build-args: "--experimental --target-platform osx-64" -# - name: Build osx-arm64 conda package -# uses: prefix-dev/rattler-build-action@v0.2.6 -# with: -# recipe-path: "conda/recipe.yaml" -# build-args: "--experimental --target-platform osx-arm64" - - name: Upload conda package - run: | - for pkg in $(find output -type f \( -name "*.conda" -o -name "*.tar.bz2" \) ); do - echo "Uploading ${pkg}" - rattler-build upload anaconda -o mittagessen -a ${{ secrets.ANACONDA_TOKEN }} "${pkg}" - done - - name: Upload conda artifacts to GH storage - uses: actions/upload-artifact@v4 - with: - name: conda_packages - path: output/*/*.conda - autodraft-gh-release: name: Create github release - needs: [build-n-publish-anaconda, build-n-publish-pypi] + needs: build-n-publish-pypi runs-on: ubuntu-latest steps: diff --git a/README.rst b/README.rst index 747b1036c..72632cee2 100644 --- a/README.rst +++ b/README.rst @@ -25,18 +25,12 @@ Installation kraken only runs on **Linux or Mac OS X**. Windows is not supported. -The latest stable releases can be installed either from `PyPi `_: +The latest stable releases can be installed from `PyPi `_: :: $ pip install kraken -or through `conda `_: - -:: - - $ conda install -c conda-forge -c mittagessen kraken - If you want direct PDF and multi-image TIFF/JPEG2000 support it is necessary to install the `pdf` extras package for PyPi: diff --git a/conda/recipe.yaml b/conda/recipe.yaml deleted file mode 100644 index 77c01b689..000000000 --- a/conda/recipe.yaml +++ /dev/null @@ -1,55 +0,0 @@ -context: - git_url: . - git_tag: ${{ git.latest_tag(git_url) }} - -package: - name: kraken - version: ${{ git_tag }} - -source: - git: ${{ git_url }} - tag: ${{ git_tag }} - -build: - script: pip install --no-deps . - -requirements: - build: - - python>=3.9,<3.12 - - setuptools>=36.6.0,<70.0.0 - - pbr - host: - - python>=3.9,<3.12 - run: - - python>=3.9,<3.12 - - python-bidi~=0.4.0 - - lxml - - regex - - requests - - click>=8.1 - - numpy~=2.0.0 - - pillow>=9.2.0 - - scipy~=1.13.0 - - jinja2~=3.0 - - torchvision - - pytorch~=2.4.0 - - cudatoolkit - - jsonschema - - scikit-image~=0.24.0 - - scikit-learn~=1.2.1 - - shapely~=1.8.5 - - pyvips - - coremltools - - pyarrow - - lightning~=2.4.0 - - torchmetrics>=1.1.0 - - conda-forge::threadpoolctl~=3.5.0 - - albumentations - - rich - -about: - homepage: https://kraken.re - license: Apache-2.0 - summary: 'OCR/HTR engine for all the languages' - repository: https://github.com/mittagessen/kraken - documentation: https://kraken.re diff --git a/docs/index.rst b/docs/index.rst index dda41e35e..4c1076a09 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -67,22 +67,12 @@ or respectively. -Installation using Conda ------------------------- +Development Branch Installation using Conda +------------------------------------------- -To install the stable version through `conda `_: - -.. code-block:: console - - $ conda install -c conda-forge -c mittagessen kraken - -Again PDF/multi-page TIFF/JPEG2000 support requires some additional dependencies: - -.. code-block:: console - - $ conda install -c conda-forge pyvips - -The git repository contains some environment files that aid in setting up the latest development version: +To install the latest development branch through `conda +`_ clone the kraken git repository and install with the +provided environment files: .. code-block:: console