diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39b50cf..c7ae17a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,22 +22,26 @@ jobs: matrix: os: ['Ubuntu'] python-version: ['3.8', '3.10'] - pytorch-version: ['2.0.0'] + pytorch-version: ['2.0.1'] steps: - uses: actions/checkout@v3 - - name: Setup conda dependencies - uses: conda-incubator/setup-miniconda@v2 + - name: Setup environment + uses: actions/setup-python@v4 with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} + python-version: ${{ matrix.python-version }} + + - name: Install pytorch + shell: bash + run: pip install torch==${{ matrix.pytorch-version }} torchvision --index-url https://download.pytorch.org/whl/cpu + - name: Install dependencies shell: bash -l {0} run: | - conda install pytorch=${{ matrix.pytorch-version }} torchvision cpuonly -c pytorch - make setup + pip install -r requirements.txt + pip install -r requirements-dev.txt - name: Check deps shell: bash -l {0} @@ -76,7 +80,7 @@ jobs: run: | conda install pytorch=${{ matrix.pytorch-version }} torchvision cpuonly -c pytorch pip install -r requirements.txt - pip install -r requirements-dev.txt; + pip install -r requirements-dev.txt - uses: quarto-dev/quarto-actions/setup@v2 diff --git a/Makefile b/Makefile index 83b0c4e..878d670 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SOURCEDIR = nbs - +DSTDIR = _nbs .PHONY: purge generate execute sphinx build setup check-deps purge: @@ -8,11 +8,11 @@ purge: generate: @echo "\n\nGenerating all tutorials notebooks to '$(SOURCEDIR)'...\n" - jupyter nbconvert $(SOURCEDIR)/**.ipynb --to notebook --output-dir $(SOURCEDIR) + jupyter nbconvert $(SOURCEDIR)/**.ipynb --to notebook --output-dir $(DSTDIR) execute: - @echo "\n\nExecuting all tutorials notebooks under '$(SOURCEDIR)'...\n" - jupyter nbconvert $(SOURCEDIR)/**.ipynb --execute --inplace + @echo "\n\nExecuting all tutorials notebooks under '$(DSTDIR)'...\n" + jupyter nbconvert $(DSTDIR)/**.ipynb --execute --inplace build: purge generate render diff --git a/nbs/color_yuv420_to_rgb.ipynb b/nbs/color_yuv420_to_rgb.ipynb index 6f76d71..03980d6 100644 --- a/nbs/color_yuv420_to_rgb.ipynb +++ b/nbs/color_yuv420_to_rgb.ipynb @@ -72,7 +72,7 @@ " return filename\n", "\n", "\n", - "url = \"http://trace.eas.asu.edu/yuv/foreman/foreman_qcif.7z\"\n", + "url = \"https://github.com/kornia/data/raw/main/foreman_qcif.7z\"\n", "download_image(url)" ] }, diff --git a/requirements-dev.txt b/requirements-dev.txt index 11d7667..0dc9665 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,2 +1,3 @@ +jupyter nbconvert pre-commit