Merge branch 'release/0.17.0'

icatproject · Apr 30, 2020 · 4f4d54f · 4f4d54f
2 parents a297f0b + c3352fd
commit 4f4d54f
Show file tree

Hide file tree

Showing 103 changed files with 11,548 additions and 2,575 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,20 +2,16 @@
 *~
 __pycache__/
 /.version
+/.vscode
 /MANIFEST
 /build/
 /dist/
-/doc/doctest/
-/doc/doctrees/
-/doc/html/
-/doc/latex/
-/doc/linkcheck/
 /icat.cfg
 /icat/__init__.py
 /tests/.cache/
 /tests/data/example_data.yaml
 /tests/data/icat.cfg
-/tests/data/icatdump.xml
-/tests/data/icatdump.yaml
+/tests/data/icatdump-*.xml
+/tests/data/icatdump-*.yaml
 /tests/data/ingest-*.xml
 /tests/scripts/
diff --git a/.rtd-require b/.rtd-require
@@ -0,0 +1,4 @@
+setuptools_scm
+suds-jurko
+PyYAML
+lxml