Skip to content

Commit

Permalink
update templates
Browse files Browse the repository at this point in the history
  • Loading branch information
felixdittrich92 committed May 10, 2024
1 parent 860ff2b commit fb7eaa6
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 88 deletions.
26 changes: 6 additions & 20 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body:
- type: markdown
attributes:
value: >
#### Before reporting a bug, please check that the issue hasn't already been addressed in [the existing and past issues](https://github.com/mindee/onnxtr/issues?q=is%3Aissue).
#### Before reporting a bug, please check that the issue hasn't already been addressed in [the existing and past issues](https://github.com/felixdittrich92/onnxtr/issues).
- type: textarea
attributes:
label: Bug description
Expand Down Expand Up @@ -49,25 +49,11 @@ body:
attributes:
label: Environment
description: |
Please run the following command and paste the output below.
```sh
wget https://raw.githubusercontent.com/mindee/onnxtr/main/scripts/collect_env.py
# For security purposes, please check the contents of collect_env.py before running it.
python collect_env.py
```
validations:
required: true
- type: textarea
attributes:
label: Deep Learning backend
description: |
Please run the following snippet and paste the output below.
```python
from onnxtr.file_utils import is_tf_available, is_torch_available
print(f"is_tf_available: {is_tf_available()}")
print(f"is_torch_available: {is_torch_available()}")
```
Please describe your environment:
OS:
Python version:
Library version:
Onnxruntime version:
validations:
required: true
- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 🚀 Feature request
description: Submit a proposal/request for a new feature for OnnxTR. Please search for existing issues before creating a new one.
description: Submit a proposal/request for a new feature for OnnxTR. Please search for existing issues before creating a new one. For non-onnx related features please use the [main repository](https://github.com/mindee/doctr/issues).
labels: 'type: enhancement'

body:
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-12, windows-latest] # TODO: change back to macos-latest if fixed
python: ["3.9", "3.10"]
steps:
- uses: actions/checkout@v4
Expand All @@ -33,23 +33,23 @@ jobs:
- name: Import package
run: python -c "import onnxtr; print(onnxtr.__version__)"

conda:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: 3.9
channels: pypdfium2-team,bblanchon,defaults,conda-forge
channel-priority: strict
- name: Install dependencies
shell: bash -el {0}
run: conda install -y conda-build conda-verify anaconda-client
- name: Build and verify
shell: bash -el {0}
run: |
python setup.py sdist
mkdir conda-dist
conda build .conda/ --output-folder conda-dist
conda-verify conda-dist/linux-64/*tar.bz2 --ignore=C1115
# conda:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: conda-incubator/setup-miniconda@v3
# with:
# auto-update-conda: true
# python-version: 3.9
# channels: pypdfium2-team,bblanchon,defaults,conda-forge
# channel-priority: strict
# - name: Install dependencies
# shell: bash -el {0}
# run: conda install -y conda-build conda-verify anaconda-client
# - name: Build and verify
# shell: bash -el {0}
# run: |
# python setup.py sdist
# mkdir conda-dist
# conda build .conda/ --output-folder conda-dist
# conda-verify conda-dist/linux-64/*tar.bz2 --ignore=C1115
88 changes: 44 additions & 44 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,48 +65,48 @@ jobs:
pip install onnxtr
python -c "import onnxtr; print(onnxtr.__version__)"
conda:
if: "!github.event.release.prerelease"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: 3.9
channels: pypdfium2-team,bblanchon,defaults,conda-forge
channel-priority: strict
- name: Install dependencies
shell: bash -el {0}
run: conda install -y conda-build conda-verify anaconda-client
- name: Get release tag
id: release_tag
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
- name: Build and publish
shell: bash -el {0}
env:
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
VERSION: ${{ steps.release_tag.outputs.VERSION }}
run: |
echo "BUILD_VERSION=${VERSION}" >> $GITHUB_ENV
python setup.py sdist
mkdir conda-dist
conda build .conda/ --output-folder conda-dist
conda-verify conda-dist/linux-64/*tar.bz2 --ignore=C1115
anaconda upload conda-dist/linux-64/*tar.bz2
# conda:
# if: "!github.event.release.prerelease"
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: conda-incubator/setup-miniconda@v3
# with:
# auto-update-conda: true
# python-version: 3.9
# channels: pypdfium2-team,bblanchon,defaults,conda-forge
# channel-priority: strict
# - name: Install dependencies
# shell: bash -el {0}
# run: conda install -y conda-build conda-verify anaconda-client
# - name: Get release tag
# id: release_tag
# run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
# - name: Build and publish
# shell: bash -el {0}
# env:
# ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
# VERSION: ${{ steps.release_tag.outputs.VERSION }}
# run: |
# echo "BUILD_VERSION=${VERSION}" >> $GITHUB_ENV
# python setup.py sdist
# mkdir conda-dist
# conda build .conda/ --output-folder conda-dist
# conda-verify conda-dist/linux-64/*tar.bz2 --ignore=C1115
# anaconda upload conda-dist/linux-64/*tar.bz2

conda-check:
if: "!github.event.release.prerelease"
runs-on: ubuntu-latest
needs: conda
steps:
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: 3.9
- name: Install package
shell: bash -el {0}
run: |
conda config --set channel_priority strict
conda install -c techMindee -c pypdfium2-team -c bblanchon -c defaults -c conda-forge python-doctr
python -c "import onnxtr; print(onnxtr.__version__)"
# conda-check:
# if: "!github.event.release.prerelease"
# runs-on: ubuntu-latest
# needs: conda
# steps:
# - uses: conda-incubator/setup-miniconda@v3
# with:
# auto-update-conda: true
# python-version: 3.9
# - name: Install package
# shell: bash -el {0}
# run: |
# conda config --set channel_priority strict
# conda install -c techMindee -c pypdfium2-team -c bblanchon -c defaults -c conda-forge python-doctr
# python -c "import onnxtr; print(onnxtr.__version__)"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ dev = [
[project.urls]
repository = "https://github.com/felixdittrich92/OnnxTR"
tracker = "https://github.com/felixdittrich92/OnnxTR/issues"
#changelog = "https://mindee.github.io/doctr/changelog.html"
changelog = "https://github.com/felixdittrich92/OnnxTR/releases"

[tool.setuptools]
zip-safe = true
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from setuptools import setup

PKG_NAME = "onnxtr"
VERSION = os.getenv("BUILD_VERSION", "0.0.1a0")
VERSION = os.getenv("BUILD_VERSION", "0.1.0a0")


if __name__ == "__main__":
Expand Down

0 comments on commit fb7eaa6

Please sign in to comment.