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

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

Commit message

Use rST include directive rather than symlinks

Description of the change

Symlinks in the tree seem to cause odd problems in some environments (tox's pip stage fails with "Operation not supported" for Python 3.5 with pyenv on Ubuntu 22.04). The `include` directive is equivalent with fewer problems.

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

I saw the symlink pattern in one repository, and applied it everywhere else. This means we / you will encounter this problem more often.

Revision history for this message
Colin Watson (cjwatson) wrote :

Yep, just wanted to make sure this was OK before mass-proposing changes ...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/lazr/restful/docs/CONTRIBUTING.rst b/src/lazr/restful/docs/CONTRIBUTING.rst
2deleted file mode 120000
3index 1d05313..0000000
4--- a/src/lazr/restful/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/restful/docs/CONTRIBUTING.rst b/src/lazr/restful/docs/CONTRIBUTING.rst
10new file mode 100644
11index 0000000..9952bd5
12--- /dev/null
13+++ b/src/lazr/restful/docs/CONTRIBUTING.rst
14@@ -0,0 +1 @@
15+.. include:: ../../../../CONTRIBUTING.rst
16diff --git a/src/lazr/restful/docs/NEWS.rst b/src/lazr/restful/docs/NEWS.rst
17deleted file mode 120000
18index 27b815d..0000000
19--- a/src/lazr/restful/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/restful/docs/NEWS.rst b/src/lazr/restful/docs/NEWS.rst
25new file mode 100644
26index 0000000..29b0804
27--- /dev/null
28+++ b/src/lazr/restful/docs/NEWS.rst
29@@ -0,0 +1 @@
30+.. include:: ../../../../NEWS.rst

Subscribers

People subscribed via source and target branches