Skip to content

Commit 21a0db6

Browse files
aminyaaminya
authored
Merge branch 'master' into betterShow
2 parents 9af7c7e + 9965f7c commit 21a0db6

File tree

22 files changed

+358
-330
lines changed

22 files changed

+358
-330
lines changed

‎.appveyor.yml‎

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

‎.github/workflows/CompatHelper.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: CompatHelper
2+
3+
on:
4+
schedule:
5+
- cron: '0 1 * * *'
6+
issues:
7+
types: [opened, reopened]
8+
9+
jobs:
10+
build:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
julia-version: [1.3.1]
15+
julia-arch: [x64]
16+
os: [ubuntu-latest]
17+
steps:
18+
- uses: julia-actions/setup-julia@latest
19+
with:
20+
version: ${{ matrix.julia-version }}
21+
- name: Install dependencies
22+
run: julia -e 'using Pkg; Pkg.add(Pkg.PackageSpec(name = "CompatHelper", url = "https://github.com/bcbi/CompatHelper.jl.git"))'
23+
- name: CompatHelper.main
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
JULIA_DEBUG: CompatHelper
27+
run: julia -e 'using CompatHelper; CompatHelper.main()'

‎.github/workflows/TagBot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: TagBot
2+
on:
3+
create
4+
jobs:
5+
TagBot:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: JuliaRegistries/TagBot@v1
9+
with:
10+
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: CI
2+
on:
3+
- push
4+
- pull_request
5+
jobs:
6+
test:
7+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
8+
runs-on: ${{ matrix.os }}
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
version:
13+
- '1.3'
14+
- 'nightly'
15+
os:
16+
- ubuntu-latest
17+
- macOS-latest
18+
- windows-latest
19+
arch:
20+
- x64
21+
steps:
22+
- uses: actions/checkout@v2
23+
- uses: julia-actions/setup-julia@latest
24+
with:
25+
version: ${{ matrix.version }}
26+
arch: ${{ matrix.arch }}
27+
- uses: julia-actions/julia-buildpkg@latest
28+
- uses: julia-actions/julia-runtest@latest

‎.github/workflows/docs.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
- 'release-'
8+
tags: '*'
9+
pull_request:
10+
11+
jobs:
12+
build:
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
matrix:
16+
julia-version: [1.3.1]
17+
julia-arch: [x64]
18+
os: [ubuntu-latest]
19+
steps:
20+
- uses: actions/checkout@v2
21+
- uses: julia-actions/setup-julia@latest
22+
with:
23+
version: ${{ matrix.julia-version }}
24+
- name: Install dependencies
25+
run: julia --project=docs -e 'using Pkg; Pkg.instantiate()'
26+
- name: Build and deploy
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
30+
run: julia --project=docs --color=yes docs/make.jl

‎.travis.yml‎

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

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The EzXML.jl package is licensed under the MIT "Expat" License:
1+
The EzXMLPatched.jl package is licensed under the MIT "Expat" License:
22

33
> Copyright (c) 2016: Kenta Sato.
44
>

‎Project.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name = "EzXML"
2-
uuid = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"
1+
name = "EzXMLPatched"
2+
uuid = "ebbc4602-91c8-4f2e-9b89-acc792d9cec0"
33
authors = ["Kenta Sato <[email protected]>"]
4-
version = "1.1.0"
4+
version = "1.0.0"
55

66
[deps]
77
XML2_jll = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"

‎README.md‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
<p align="center"><img src="/docs/EzXML.jl.png" alt="EzXML.jl Logo" width="350" /></p>
1+
<p align="center"><img src="/docs/EzXMLPatched.jl.png" alt="EzXMLPatched.jl Logo" width="350" /></p>
22

3-
EzXML.jl - XML/HTML tools for primates
3+
EzXMLPatched.jl - XML/HTML tools for primates
44
======================================
55

66
[![Docs Stable][docs-stable-img]][docs-stable-url]
77
[![Docs Latest][docs-latest-img]][docs-latest-url]
8-
[![TravisCI Status][travisci-img]][travisci-url]
9-
[![Appveyor Status][appveyor-img]][appveyor-url]
8+
![Build Status (Github Actions)](https://github.com/aminya/EzXMLPatched.jl/workflows/CI/badge.svg)
109
[![codecov.io][codecov-img]][codecov-url]
1110

12-
EzXML.jl is a package to handle XML/HTML documents for primates.
11+
EzXMLPatched.jl is a package to handle XML/HTML documents for primates.
1312

1413
The main features are:
1514
* Reading and writing XML/HTML documents.
@@ -24,9 +23,9 @@ The main features are:
2423
Installation
2524
------------
2625

27-
Install EzXML.jl as follows:
26+
Install EzXMLPatched.jl as follows:
2827
```
29-
julia -e 'using Pkg; Pkg.add("EzXML")'
28+
julia -e 'using Pkg; Pkg.add("EzXMLPatched")'
3029
```
3130

3231
This package depends on [libxml2](http://xmlsoft.org/) 2.9.9, which will be automatically installed as an artifact via [XML2_jll.jl](https://github.com/JuliaBinaryWrappers/XML2_jll.jl) if you use Julia 1.3 or later.
@@ -35,7 +34,7 @@ Currently, Windows, Linux, macOS, and FreeBSD are now supported.
3534
Version compatibility
3635
---------------------
3736

38-
| EzXML.jl | Julia |
37+
| EzXMLPatched.jl | Julia |
3938
|:--------:|:------------:|
4039
| 1.0 | 1.0 or later |
4140
| 1.1 | 1.3 or later |
@@ -45,7 +44,7 @@ Usage
4544

4645
```julia
4746
# Load the package.
48-
using EzXML
47+
using EzXMLPatched
4948

5049
# Parse an XML string
5150
# (use `readxml(<filename>)` to read a document from a file).
@@ -86,13 +85,13 @@ end
8685
Quick reference
8786
---------------
8887

89-
See the [reference page](https://bicycle1885.github.io/EzXML.jl/stable/reference/) or docstrings for more details.
88+
See the [reference page](https://bicycle1885.github.io/EzXMLPatched.jl/stable/reference/) or docstrings for more details.
9089

9190
Types:
92-
* `EzXML.Document`: an XML/HTML document
93-
* `EzXML.Node`: an XML/HTML node including elements, attributes, texts, etc.
94-
* `EzXML.XMLError`: an error happened in libxml2
95-
* `EzXML.StreamReader`: a streaming XML reader
91+
* `EzXMLPatched.Document`: an XML/HTML document
92+
* `EzXMLPatched.Node`: an XML/HTML node including elements, attributes, texts, etc.
93+
* `EzXMLPatched.XMLError`: an error happened in libxml2
94+
* `EzXMLPatched.StreamReader`: a streaming XML reader
9695

9796
IO:
9897
* From file: `readxml(filename|stream)`, `readhtml(filename|stream)`
@@ -130,8 +129,8 @@ Accessors:
130129
* Namespaces: `namespace(node)`, `namespaces(node)`
131130

132131
Constructors:
133-
* `EzXML.Document` type: `XMLDocument(version="1.0")`, `HTMLDocument(uri=nothing, externalID=nothing)`
134-
* `EzXML.Node` type: `XMLDocumentNode(version="1.0")`, `HTMLDocumentNode(uri, externalID)`, `ElementNode(name)`, `TextNode(content)`, `CommentNode(content)`, `CDataNode(content)`, `AttributeNode(name, value)`, `DTDNode(name, [systemID, [externalID]])`
132+
* `EzXMLPatched.Document` type: `XMLDocument(version="1.0")`, `HTMLDocument(uri=nothing, externalID=nothing)`
133+
* `EzXMLPatched.Node` type: `XMLDocumentNode(version="1.0")`, `HTMLDocumentNode(uri, externalID)`, `ElementNode(name)`, `TextNode(content)`, `CommentNode(content)`, `CDataNode(content)`, `AttributeNode(name, value)`, `DTDNode(name, [systemID, [externalID]])`
135134

136135
Queries:
137136
* XPath: `findall(xpath, doc|node)`, `findfirst(xpath, doc|node)`, `findlast(xpath, doc|node)`
@@ -150,12 +149,12 @@ Other XML/HTML packages in Julia
150149
* [LibExpat.jl](https://github.com/amitmurthy/LibExpat.jl)
151150

152151
[docs-stable-img]: https://img.shields.io/badge/docs-stable-blue.svg
153-
[docs-stable-url]: https://bicycle1885.github.io/EzXML.jl/stable
152+
[docs-stable-url]: https://bicycle1885.github.io/EzXMLPatched.jl/stable
154153
[docs-latest-img]: https://img.shields.io/badge/docs-latest-blue.svg
155-
[docs-latest-url]: https://bicycle1885.github.io/EzXML.jl/latest
156-
[travisci-img]: https://travis-ci.org/bicycle1885/EzXML.jl.svg?branch=master
157-
[travisci-url]: https://travis-ci.org/bicycle1885/EzXML.jl
154+
[docs-latest-url]: https://bicycle1885.github.io/EzXMLPatched.jl/latest
155+
[travisci-img]: https://travis-ci.org/bicycle1885/EzXMLPatched.jl.svg?branch=master
156+
[travisci-url]: https://travis-ci.org/bicycle1885/EzXMLPatched.jl
158157
[appveyor-img]: https://ci.appveyor.com/api/projects/status/n5d7o2mmy8ckdjc8?svg=true
159158
[appveyor-url]: https://ci.appveyor.com/project/bicycle1885/ezxml-jl
160-
[codecov-img]: http://codecov.io/github/bicycle1885/EzXML.jl/coverage.svg?branch=master
161-
[codecov-url]: http://codecov.io/github/bicycle1885/EzXML.jl?branch=master
159+
[codecov-img]: http://codecov.io/github/bicycle1885/EzXMLPatched.jl/coverage.svg?branch=master
160+
[codecov-url]: http://codecov.io/github/bicycle1885/EzXMLPatched.jl?branch=master

‎docs/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[deps]
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3-
EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"
3+
EzXMLPatched = "ebbc4602-91c8-4f2e-9b89-acc792d9cec0"
44

55
[compat]
66
Documenter = "~0.24"

0 commit comments

Comments
 (0)