ソースを参照

restructured the folder tree, now there are src,config and samples directories. other directories such as build,dist and log are generated automatically.
changed some files so everything works with the new tree.

digital 7 年 前
コミット
ba7cb60797

+ 2 - 2
Makefile

@@ -22,8 +22,8 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = BeeWatch
-SOURCEDIR     = docs/src/
-BUILDDIR      = docs/
+SOURCEDIR     = src/docs/
+BUILDDIR      = build/docs/
 
 # Put it first so that "make" without argument is like "make help".
 help:

+ 0 - 0
build_response


+ 3 - 0
sample/gui.py

@@ -30,6 +30,9 @@ import sys
 import time
 import traceback
 import yaml
+
+# add the source dir to the path, python finds the beewatch module.
+sys.path.insert(0,"src")
 # My Libraries
 import beewatch
 import beewatch.gui

+ 2 - 0
sample/server.py

@@ -35,6 +35,8 @@ import yaml
 import blinker
 import curio
 
+# add the source dir to the path, python finds the beewatch module.
+sys.path.insert(0,"src")
 import beewatch
 # import beewatch
 import beewatch.server

+ 3 - 0
setup.py

@@ -31,6 +31,9 @@ setup_kwargs = {
         'beewatch.pinapi',
         'beewatch.server',
     ],
+    'package_dir':{
+        'beewatch':'src/beewatch'
+    },
 }
 
 setup(**setup_kwargs)

+ 0 - 0
beewatch/__init__.py → src/beewatch/__init__.py


+ 0 - 0
beewatch/config_/__init__.py → src/beewatch/config_/__init__.py


+ 0 - 0
beewatch/gui/__init__.py → src/beewatch/gui/__init__.py


+ 0 - 0
beewatch/pinapi/__init__.py → src/beewatch/pinapi/__init__.py


+ 0 - 0
beewatch/server/__init__.py → src/beewatch/server/__init__.py


+ 0 - 0
docs/src/beewatch/gui/index.rst → src/docs/beewatch/gui/index.rst


+ 0 - 0
docs/src/beewatch/index.rst → src/docs/beewatch/index.rst


+ 0 - 0
docs/src/beewatch/pinapi/index.rst → src/docs/beewatch/pinapi/index.rst


+ 0 - 0
docs/src/beewatch/server/index.rst → src/docs/beewatch/server/index.rst


+ 0 - 0
docs/src/conf.py → src/docs/conf.py


+ 0 - 0
docs/src/configure.rst → src/docs/configure.rst


+ 0 - 0
docs/src/design.rst → src/docs/design.rst


+ 0 - 0
docs/src/getting_started.rst → src/docs/getting_started.rst


+ 0 - 0
docs/src/includes/free_software.rst → src/docs/includes/free_software.rst


+ 0 - 0
docs/src/includes/indicestables.rst → src/docs/includes/indicestables.rst


+ 0 - 0
docs/src/includes/links.rst → src/docs/includes/links.rst


+ 0 - 0
docs/src/includes/tellme.rst → src/docs/includes/tellme.rst


+ 0 - 0
docs/src/index.rst → src/docs/index.rst


+ 0 - 0
docs/src/inspiration.rst → src/docs/inspiration.rst


+ 0 - 0
docs/src/install.rst → src/docs/install.rst


+ 1 - 0
src/docs/static/.notemptydir

@@ -0,0 +1 @@
+# this file only exits so the static folder doesn't get ignored. empty directories get apparently ignored.

+ 0 - 0
docs/src/templates/index.rst → src/docs/templates/index.rst