lazr.restfulclient

Merge ~cjwatson/lazr.restfulclient:rst-include into lazr.restfulclient:main

  1. Git
  2. lp:~cjwatson/lazr.restfulclient
  3. rst-include
  4. Merge into main
Proposed by Colin Watson
Status: Merged
Merged at revision: 0b59e825465fefef2158ab856f72c0922afd0a62
Proposed branch: ~cjwatson/lazr.restfulclient:rst-include
Merge into: lazr.restfulclient:main
Diff against target: 43 lines (+3/-2)
4 files modified
dev/null (+0/-1)
src/lazr/restfulclient/docs/CONTRIBUTING.rst (+1/-0)
src/lazr/restfulclient/docs/NEWS.rst (+1/-0)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+413611@code.launchpad.net

Commit message

Use rST include directive rather than symlinks

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/lazr/restfulclient/docs/CONTRIBUTING.rst b/src/lazr/restfulclient/docs/CONTRIBUTING.rst
2deleted file mode 120000
3index 1d05313..0000000
4--- a/src/lazr/restfulclient/docs/CONTRIBUTING.rst
5+++ /dev/null
6@@ -1 +0,0 @@
7-../../../../CONTRIBUTING.rst
8\ No newline at end of file
9diff --git a/src/lazr/restfulclient/docs/CONTRIBUTING.rst b/src/lazr/restfulclient/docs/CONTRIBUTING.rst
10new file mode 100644
11index 0000000..9952bd5
12--- /dev/null
13+++ b/src/lazr/restfulclient/docs/CONTRIBUTING.rst
14@@ -0,0 +1 @@
15+.. include:: ../../../../CONTRIBUTING.rst
16diff --git a/src/lazr/restfulclient/docs/NEWS.rst b/src/lazr/restfulclient/docs/NEWS.rst
17deleted file mode 120000
18index 27b815d..0000000
19--- a/src/lazr/restfulclient/docs/NEWS.rst
20+++ /dev/null
21@@ -1 +0,0 @@
22-../../../../NEWS.rst
23\ No newline at end of file
24diff --git a/src/lazr/restfulclient/docs/NEWS.rst b/src/lazr/restfulclient/docs/NEWS.rst
25new file mode 100644
26index 0000000..29b0804
27--- /dev/null
28+++ b/src/lazr/restfulclient/docs/NEWS.rst
29@@ -0,0 +1 @@
30+.. include:: ../../../../NEWS.rst
31diff --git a/tox.ini b/tox.ini
32index e1b6eb9..7df2f97 100644
33--- a/tox.ini
34+++ b/tox.ini
35@@ -18,7 +18,7 @@ commands =
36
37 [testenv:docs]
38 basepython =
39- python2.7
40+ python3
41 commands =
42 sphinx-build -b html -d src/lazr/restfulclient/docs/_build/doctrees src/lazr/restfulclient/docs src/lazr/restfulclient/docs/_build/html
43 deps =

Subscribers

People subscribed via source and target branches