Skip to content

Commit 172f139

Browse files
SimonDanischSimonDanisch
authored
Merge pull request #8 from JuliaGeometry/sd-release
get ready for release
2 parents 04e5dd7 + ddf72ee commit 172f139

File tree

9 files changed

+96
-67
lines changed

9 files changed

+96
-67
lines changed

‎.appveyor.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Documentation: https://github.com/JuliaCI/Appveyor.jl
2+
environment:
3+
matrix:
4+
- julia_version: 1.0
5+
- julia_version: nightly
6+
platform:
7+
- x86
8+
- x64
9+
matrix:
10+
allow_failures:
11+
- julia_version: nightly
12+
branches:
13+
only:
14+
- master
15+
- /release-.*/
16+
notifications:
17+
- provider: Email
18+
on_build_success: false
19+
on_build_failure: false
20+
on_build_status_changed: false
21+
install:
22+
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
23+
build_script:
24+
- echo "%JL_BUILD_SCRIPT%"
25+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
26+
test_script:
27+
- echo "%JL_TEST_SCRIPT%"
28+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
29+
on_success:
30+
- echo "%JL_CODECOV_SCRIPT%"
31+
- C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

‎.gitignore‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1+
*.jl.*.cov
12
*.jl.cov
23
*.jl.mem
3-
*.smesh
4-
*.node
5-
*.face
6-
*.ele
7-
*.edge
8-
deps/build.log
4+
.DS_Store
5+
/Manifest.toml

‎.travis.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
# Documentation: http://docs.travis-ci.com/user/languages/julia/
12
language: julia
23
os:
34
- linux
45
- osx
56
julia:
6-
- 0.6
7-
- 0.7
8-
7+
- 1.1
8+
- nightly
99
matrix:
1010
allow_failures:
11-
- julia: 0.7
12-
11+
- julia: nightly
12+
fast_finish: true
1313
notifications:
1414
email: false
15-
sudo: false
15+
after_success:
16+
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

‎Project.toml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name = "TetGen"
2+
uuid = "c5d3f3f7-f850-59f6-8a2e-ffc6dc1317ea"
3+
authors = ["SimonDanisch <[email protected]>"]
4+
version = "0.1.0"
5+
6+
[deps]
7+
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
8+
GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
9+
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
10+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
11+
12+
[extras]
13+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
14+
15+
[targets]
16+
test = ["Test"]

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# TetGen
22

3-
[![Build Status](https://travis-ci.org/JuliaGeometry/TetGen.jl.svg)](https://travis-ci.org/JuliaGeometry/TetGen.jl)
4-
[![Coverage Status](https://coveralls.io/repos/JuliaGeometry/TetGen.jl/badge.svg)](https://coveralls.io/r/JuliaGeometry/TetGen.jl)
3+
[![Build Status](https://travis-ci.com/JuliaGeometry/TetGen.jl.svg?branch=master)](https://travis-ci.com/JuliaGeometry/TetGen.jl)
4+
[![Build Status](https://ci.appveyor.com/api/projects/status/github/JuliaGeometry/TetGen.jl?svg=true)](https://ci.appveyor.com/project/JuliaGeometry/TetGen-jl)
5+
[![Codecov](https://codecov.io/gh/JuliaGeometry/TetGen.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaGeometry/TetGen.jl)
56
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-orange.svg)](https://github.com/JuliaGeometry/TetGen.jl/blob/master/LICENSE)
67

7-
The `TetGen.jl` package is a Julia wrapper for the C++ project [TetGen](wias-berlin.de/software/tetgen/). This wrapper enables TetGen based tetrahedral meshing, and (constrained) 3D Delaunay and Voronoi tesselation.
8+
The `TetGen.jl` package is a Julia wrapper for the C++ project [TetGen](wias-berlin.de/software/tetgen/). This wrapper enables TetGen based tetrahedral meshing, and (constrained) 3D Delaunay and Voronoi tesselation.
89

910
## Example
1011

@@ -51,4 +52,3 @@ Plotted with Makie:
5152

5253

5354
## [Code of conduct](https://github.com/JuliaGeometry/TetGen.jl/blob/master/CODE_OF_CONDUCT.md)
54-

‎REQUIRE‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎appveyor.yml‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,31 @@
1+
# Documentation: https://github.com/JuliaCI/Appveyor.jl
12
environment:
23
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
5-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
6-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
7-
4+
- julia_version: 1.1
5+
- julia_version: nightly
6+
platform:
7+
- x86
8+
- x64
9+
matrix:
10+
allow_failures:
11+
- julia_version: nightly
812
branches:
913
only:
1014
- master
11-
# - /release-.*/
12-
13-
matrix:
14-
allow_failures:
15-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
16-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
17-
15+
- /release-.*/
1816
notifications:
1917
- provider: Email
2018
on_build_success: false
2119
on_build_failure: false
2220
on_build_status_changed: false
23-
2421
install:
25-
- ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
26-
# If there's a newer build queued for the same PR, cancel this one
27-
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
28-
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
29-
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
30-
throw "There are newer queued builds for this pull request, failing early." }
31-
# Download most recent Julia Windows binary
32-
- ps: (new-object net.webclient).DownloadFile(
33-
$env:JULIA_URL,
34-
"C:\projects\julia-binary.exe")
35-
# Run installer silently, output to C:\projects\julia
36-
- C:\projects\julia-binary.exe /S /D=C:\projects\julia
37-
22+
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
3823
build_script:
39-
# Need to convert from shallow to complete for Pkg.clone to work
40-
- IF EXIST .git\shallow (git fetch --unshallow)
41-
- C:\projects\julia\bin\julia -e "versioninfo();
42-
Pkg.clone(pwd(), \"TetGen\"); Pkg.build(\"TetGen\")"
43-
24+
- echo "%JL_BUILD_SCRIPT%"
25+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
4426
test_script:
45-
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"TetGen\")"
27+
- echo "%JL_TEST_SCRIPT%"
28+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
29+
on_success:
30+
- echo "%JL_CODECOV_SCRIPT%"
31+
- C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

‎deps/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/usr/
22
deps.jl
3+
build.log

‎test/runtests.jl‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using TetGen: JLPolygon, TetgenIO, JLFacet, Point
33
using GeometryBasics
44
using GeometryBasics: Mesh, Triangle, Tetrahedron, TriangleFace, QuadFace,
55
PointMeta, NgonFaceMeta, meta, faces, metafree
6-
using StructArrays
6+
using GeometryBasics.StructArrays
77
using Test
88

99
# Construct a cube out of Quads
@@ -33,18 +33,18 @@ points = rand(Point{3, Float64}, 100)
3333
result = TetGen.voronoi(points)
3434
@test result isa Mesh
3535

36-
s = Sphere{Float64}(Point(0.0, 0.0, 0.0), 2.0)
37-
38-
x = PlainMesh{Float64, Triangle{Cint}}(s)
39-
40-
function Mesh{T, Dim, FaceType}(a::AbstractGeometry; resolution = nothing)
41-
P = Point{T, Dim}
42-
Mesh(
43-
coordinates(a, P; resolution = resolution),
44-
faces(a, FaceType; resolution = resolution)
45-
)
46-
end
47-
48-
s = Sphere{Float64}(Point(0.0, 0.0, 0.0), 1.0)
49-
50-
y = PlainMesh{Float64, Triangle{Cint}}(s)
36+
# s = Sphere{Float64}(Point(0.0, 0.0, 0.0), 2.0)
37+
#
38+
# x = PlainMesh{Float64, Triangle{Cint}}(s)
39+
#
40+
# function Mesh{T, Dim, FaceType}(a::AbstractGeometry; resolution = nothing)
41+
# P = Point{T, Dim}
42+
# Mesh(
43+
# coordinates(a, P; resolution = resolution),
44+
# faces(a, FaceType; resolution = resolution)
45+
# )
46+
# end
47+
#
48+
# s = Sphere{Float64}(Point(0.0, 0.0, 0.0), 1.0)
49+
#
50+
# y = PlainMesh{Float64, Triangle{Cint}}(s)

0 commit comments

Comments
 (0)