Skip to content

Commit ea37280

Browse files
authored
Merge pull request #555 from hyanwong/svg-corrections
Svg corrections
2 parents 48ed653 + bb295af commit ea37280

File tree

10 files changed

+876
-148
lines changed

10 files changed

+876
-148
lines changed

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ build_script:
2626
- cmd: python -m pip install PyVCF
2727
- cmd: python -m pip install newick
2828
- cmd: python -m pip install python_jsonschema_objects
29+
- cmd: python -m pip install xmlunittest
2930
- cmd: python -m nose
3031

3132
after_test:

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ def handle_item(fieldarg, content):
279279
intersphinx_mapping = {
280280
"https://docs.python.org/": None,
281281
"http://docs.scipy.org/doc/numpy/": None,
282+
"https://svgwrite.readthedocs.io/en/stable/": None,
282283
}
283284

284285
# -- Options for todo extension ----------------------------------------------

python/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ In development
66

77
**New features**
88

9+
- Add classes to SVG drawings to allow easy adjustment and styling, and document the new
10+
``tskit.Tree.draw_svg()`` and ``tskit.TreeSequence.draw_svg()`` methods. This also fixes
11+
:issue:`467` for duplicate SVG entity ``id`` s in Jupyter notebooks.
12+
(:user:`hyanwong`, :pr:`555`)
13+
914
- Add a ``nexus`` function that outputs a tree sequence in Nexus format
1015
(:user:`saunack`, :pr:`550`).
1116

python/requirements/CI/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ sphinx==2.4.4
2222
sphinx-argparse==0.2.5
2323
sphinx-issues==1.2.0
2424
sphinx_rtd_theme==0.4.3
25-
svgwrite==1.4
25+
svgwrite==1.4
26+
xmlunittest==0.5.0

python/requirements/development.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ sphinx==2.4.4 #Pinned as breathe v3 compatibility is rough for now.
2222
sphinx-argparse
2323
sphinx-issues
2424
sphinx_rtd_theme
25-
svgwrite
25+
svgwrite
26+
xmlunittest

python/tests/data/svg/tree.svg

Lines changed: 70 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)