소스 검색

venv requirements added + fixed conf.py

master
Dirk Alders 2 달 전
부모
커밋
37c9dadcd0
12개의 변경된 파일19개의 추가작업 그리고 16개의 파일을 삭제
  1. 5
    5
      Makefile
  2. 1
    1
      caching
  3. 2
    2
      conf.py
  4. 1
    1
      fstools
  5. 1
    1
      helpers
  6. 1
    1
      report
  7. 3
    0
      requirements.txt
  8. 1
    1
      socket_protocol
  9. 1
    1
      state_machine
  10. 1
    1
      stringtools
  11. 1
    1
      task
  12. 1
    1
      tcp_socket

+ 5
- 5
Makefile 파일 보기

@@ -3,7 +3,7 @@
3 3
 
4 4
 # You can set these variables from the command line.
5 5
 SPHINXOPTS    =
6
-SPHINXBUILD   = sphinx-build
6
+SPHINXBUILD   = venv/bin/sphinx-build
7 7
 SOURCEDIR     = .
8 8
 BUILDDIR      = _build
9 9
 MODULES       = $(sort \
@@ -49,8 +49,8 @@ index.rst: Makefile
49 49
 	@echo "Preparing $@"
50 50
 	@echo ".. automodule:: $@\n   :members:" > $@.rst
51 51
 	@if [ "$(findstring .,$@)" != "." ]; then \
52
-		git -C $@ checkout master; \
53
-		git -C $@ pull; \
52
+		git -C $@ checkout master 2>&1; \
53
+		git -C $@ pull 2>&1;\
54 54
 		make -C $@/_examples_ all; \
55 55
 	fi
56 56
 	@echo "   $@.rst" >> index.rst; \
@@ -63,5 +63,5 @@ update:
63 63
 	git submodule foreach git pull
64 64
 
65 65
 copy:
66
-	rsync -av --delete _build/html/ /data/webroot/pylib_docs/
67
-	chown www-data.www-data -R /data/webroot/pylib_docs/
66
+	rsync -av --delete _build/html/ /data/htdocs/pylib_docs/
67
+	chown www-data.www-data -R /data/htdocs/pylib_docs/

+ 1
- 1
caching

@@ -1 +1 @@
1
-Subproject commit 01cf327609fcac0dbddbad4168ae154cf625bbee
1
+Subproject commit ed1082041f8b7940e5ed6238eead2b97a5b3e862

+ 2
- 2
conf.py 파일 보기

@@ -41,7 +41,7 @@ release = ''
41 41
 extensions = [
42 42
     'sphinx.ext.autodoc',
43 43
     'sphinx.ext.coverage',
44
-    'sphinx_rtd_theme',
44
+    'python_docs_theme',
45 45
 ]
46 46
 
47 47
 # Add any paths that contain templates here, relative to this directory.
@@ -77,7 +77,7 @@ pygments_style = None
77 77
 # The theme to use for HTML and HTML Help pages.  See the documentation for
78 78
 # a list of builtin themes.
79 79
 #
80
-html_theme = 'sphinx_rtd_theme'
80
+html_theme = 'python_docs_theme'
81 81
 
82 82
 # Theme options are theme-specific and customize the look and feel of a theme
83 83
 # further.  For a list of options available for each theme, see the

+ 1
- 1
fstools

@@ -1 +1 @@
1
-Subproject commit 262141f2956757b0c8cbce8724728fa1d0630297
1
+Subproject commit c10e8792abb05671dab6de51cdadda3bf8ead50f

+ 1
- 1
helpers

@@ -1 +1 @@
1
-Subproject commit 4be70cfef8b8304979ea2402b285ef779855ad5f
1
+Subproject commit c4f055189856dddf9f05c56189453370d25ba620

+ 1
- 1
report

@@ -1 +1 @@
1
-Subproject commit 25889f225b3593d515e37bebffef21458c961f64
1
+Subproject commit 7003c13ef8c7e7c3a55a545cbbad4039cc024a9f

+ 3
- 0
requirements.txt 파일 보기

@@ -0,0 +1,3 @@
1
+sphinx
2
+python-docs-theme
3
+

+ 1
- 1
socket_protocol

@@ -1 +1 @@
1
-Subproject commit 35d9f688a4f080a8cae70a18e27036b55399edde
1
+Subproject commit 7f2b90c99030ac39f5bf7bfd92d1dd3d6c3657fa

+ 1
- 1
state_machine

@@ -1 +1 @@
1
-Subproject commit db70e14d4650c9894ee0ff5c5c6078264ce59b46
1
+Subproject commit aef99580e1cdc05e6ca80efe05461ab861d6ef39

+ 1
- 1
stringtools

@@ -1 +1 @@
1
-Subproject commit 5ac92e2b864cd27bd4026352ba9149f4d23ca019
1
+Subproject commit e1f76d96312e540544b2328d0937b0aa41126aa9

+ 1
- 1
task

@@ -1 +1 @@
1
-Subproject commit 9fbd98f39cb919603ddc784608aa1eb354129b3e
1
+Subproject commit af35e83d1f07fd4cb9070bdb77cf1f3bdda3a463

+ 1
- 1
tcp_socket

@@ -1 +1 @@
1
-Subproject commit a34195edf977fe9e2372df6beb3f915eeb8aabe4
1
+Subproject commit ffe6b2bf3ba5829361349ff318cb721cb6f42266

Loading…
취소
저장