Skip to content

Commit 375a593

Browse files
MikeInnesMikeInnes
committed
Merge branch 'master' into patch
2 parents 0af43e0 + 2fe6426 commit 375a593

File tree

12 files changed

+437
-279
lines changed

12 files changed

+437
-279
lines changed

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
docs/build/
88
docs/site/
99

10-
docs/Manifest.toml
11-
1210
*.ipynb_checkpoints
1311
**/*.ipynb_checkpoints
1412
**/**/*.ipynb_checkpoints

‎.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
language: julia
22
os:
33
- linux
4-
- osx
54
julia:
6-
- 0.6
75
- 1.0
86
- nightly
97
matrix:
@@ -12,10 +10,6 @@ matrix:
1210
notifications:
1311
email: false
1412

15-
env:
16-
global:
17-
- DOCUMENTER_DEBUG=true
18-
1913
jobs:
2014
include:
2115
- stage: "Documentation"

‎Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ CSTParser = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
66
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
77
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
88
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
9+
10+
[compat]
11+
julia = "≥ 1.0"

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# MacroTools.jl
22

3+
[![Build Status](https://travis-ci.org/MikeInnes/MacroTools.jl.svg?branch=master)](https://travis-ci.org/MikeInnes/MacroTools.jl)
4+
35
This library provides helpful tools for writing macros, notably a very simple
46
but powerful templating system and some functions that have proven useful to me (see
57
[utils.jl](src/utils.jl).)

‎REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
julia 0.6
1+
julia 1.0
22
Compat 0.62
33
DataStructures
44
CSTParser

‎docs/Manifest.toml

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
[[Base64]]
4+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
5+
6+
[[Compat]]
7+
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
8+
git-tree-sha1 = "84aa74986c5b9b898b0d1acaf3258741ee64754f"
9+
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
10+
version = "2.1.0"
11+
12+
[[Dates]]
13+
deps = ["Printf"]
14+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
15+
16+
[[DelimitedFiles]]
17+
deps = ["Mmap"]
18+
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
19+
20+
[[Distributed]]
21+
deps = ["Random", "Serialization", "Sockets"]
22+
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
23+
24+
[[DocStringExtensions]]
25+
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
26+
git-tree-sha1 = "4d30e889c9f106a51ffa4791a88ffd4765bf20c3"
27+
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
28+
version = "0.7.0"
29+
30+
[[Documenter]]
31+
deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "Pkg", "REPL", "Random", "Test", "Unicode"]
32+
git-tree-sha1 = "04d40966cddd2ea5d227e7130484b57ac4718596"
33+
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
34+
version = "0.22.1"
35+
36+
[[InteractiveUtils]]
37+
deps = ["Markdown"]
38+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
39+
40+
[[JSON]]
41+
deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"]
42+
git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa"
43+
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
44+
version = "0.20.0"
45+
46+
[[LibGit2]]
47+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
48+
49+
[[Libdl]]
50+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
51+
52+
[[LinearAlgebra]]
53+
deps = ["Libdl"]
54+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
55+
56+
[[Logging]]
57+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
58+
59+
[[MacroTools]]
60+
deps = ["Compat"]
61+
path = ".."
62+
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
63+
version = "0.4.5+"
64+
65+
[[Markdown]]
66+
deps = ["Base64"]
67+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
68+
69+
[[Mmap]]
70+
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
71+
72+
[[Pkg]]
73+
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
74+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
75+
76+
[[Printf]]
77+
deps = ["Unicode"]
78+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
79+
80+
[[REPL]]
81+
deps = ["InteractiveUtils", "Markdown", "Sockets"]
82+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
83+
84+
[[Random]]
85+
deps = ["Serialization"]
86+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
87+
88+
[[SHA]]
89+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
90+
91+
[[Serialization]]
92+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
93+
94+
[[SharedArrays]]
95+
deps = ["Distributed", "Mmap", "Random", "Serialization"]
96+
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
97+
98+
[[Sockets]]
99+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
100+
101+
[[SparseArrays]]
102+
deps = ["LinearAlgebra", "Random"]
103+
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
104+
105+
[[Statistics]]
106+
deps = ["LinearAlgebra", "SparseArrays"]
107+
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
108+
109+
[[Test]]
110+
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
111+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
112+
113+
[[UUIDs]]
114+
deps = ["Random", "SHA"]
115+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
116+
117+
[[Unicode]]
118+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

‎docs/Project.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[deps]
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
33
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
4-
5-
[compat]
6-
Documenter = "~0.19"

‎docs/make.jl

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
using Documenter, MacroTools
22

33
makedocs(
4-
modules = [MacroTools],
5-
format = :html,
64
sitename = "MacroTools",
7-
pages = Any[
8-
"Introduction to MacroTools" => "index.md"
9-
],
10-
# Use clean URLs, unless built as a "local" build
11-
html_prettyurls = !("local" in ARGS),
12-
# html_canonical = "https://juliadocs.github.io/Documenter.jl/latest/",
13-
)
5+
pages = [
6+
"Home" => "index.md",
7+
"Pattern Matching" => "pattern-matching.md",
8+
"Utilities" => "utilities.md"],
9+
format = Documenter.HTML(prettyurls = haskey(ENV, "CI")))
1410

1511
deploydocs(
16-
repo = "[email protected]:MikeInnes/MacroTools.jl.git",
17-
target = "build",
18-
julia = "1.0",
19-
osname = "linux",
20-
deps = nothing,
21-
make = nothing,
22-
)
12+
repo = "github.com/MikeInnes/MacroTools.jl.git",)

0 commit comments

Comments
 (0)