Merge branch 'master' into sd/fix-uv-eltype

Author: SimonDanisch

.github/workflows/ci.yml

@@ -1,7 +1,12 @@
 name: CI
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+    tags: '*'
+  pull_request:
+    branches:
+      - master
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -11,8 +16,7 @@ jobs:
       matrix:
         version:
           - '1.3'
-          - '1'
-          - 'nightly'
+          - '1.7'
         os:
           - ubuntu-latest
           - macOS-latest
@@ -50,18 +54,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
         with:
-          version: '1.6'
+          version: '1.7'
       - run: |
           julia --project=docs -e '
             using Pkg
             Pkg.develop(PackageSpec(path=pwd()))
             Pkg.instantiate()'
-      - run: |
-          julia --project=docs -e '
-            using Documenter: doctest, DocMeta
-            using GeometryBasics
-            DocMeta.setdocmeta!(GeometryBasics, :DocTestSetup, :(using GeometryBasics); recursive=true)
-            doctest(GeometryBasics)'
       - run: julia --project=docs docs/make.jl
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -3,5 +3,6 @@
 *.jl.mem
 .DS_Store
 /Manifest.toml
+docs/Manifest.toml
 docs/build/
 *~

docs/make.jl

@@ -1,7 +1,6 @@
 #! /usr/bin/env julia
 
 using Documenter
-
 using GeometryBasics
 
 DocMeta.setdocmeta!(GeometryBasics, :DocTestSetup, :(using GeometryBasics); recursive=true)

test/runtests.jl

@@ -491,9 +491,9 @@ end
 
     @test texturecoordinates(m) == nothing
     r2 = Rect2(0.0, 0.0, 1.0, 1.0)
-    @test iterate(texturecoordinates(r2)) == ((0.0, 1.0), ((0.0, 2), (1.0, 2)))
+    @test collect(texturecoordinates(r2)) == [(0.0, 1.0), (1.0, 1.0), (0.0, 0.0), (1.0, 0.0)]
     r3 = Rect3(0.0, 0.0, 1.0, 1.0, 2.0, 2.0)
-    @test iterate(texturecoordinates(r3)) == ([0, 0, 0], 2)
+    @test first(texturecoordinates(r3)) == Vec3(0, 0, 0)
     uv = decompose_uv(m)
     @test Rect(Point.(uv)) == Rect(0, 0, 1, 1)