changed comple folder structure of project ot be compliant with pypi …

…packaging
sneusse · May 21, 2015 · 36538de · 36538de
1 parent 0259872
commit 36538de
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 19 deletions.
diff --git a/Makefile → docs/Makefile b/Makefile → docs/Makefile
@@ -10,9 +10,9 @@ BUILDDIR      = build
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ../docs
 # the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ../docs
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
 

diff --git a/source/conf.py → docs/conf.py b/source/conf.py → docs/conf.py
@@ -16,7 +16,7 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../mdfreader'))
 
 # -- General configuration -----------------------------------------------------
 
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.1'
+release = '1.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/source/index.rst → docs/index.rst b/source/index.rst → docs/index.rst
diff --git a/source/mdf3reader/index.rst → docs/mdf3reader/index.rst b/source/mdf3reader/index.rst → docs/mdf3reader/index.rst
diff --git a/source/mdf4reader/index.rst → docs/mdf4reader/index.rst b/source/mdf4reader/index.rst → docs/mdf4reader/index.rst
diff --git a/source/mdfinfo3/index.rst → docs/mdfinfo3/index.rst b/source/mdfinfo3/index.rst → docs/mdfinfo3/index.rst
diff --git a/source/mdfinfo4/index.rst → docs/mdfinfo4/index.rst b/source/mdfinfo4/index.rst → docs/mdfinfo4/index.rst
diff --git a/mdfreader.pdf → docs/mdfreader.pdf b/mdfreader.pdf → docs/mdfreader.pdf
diff --git a/source/mdfreader/index.rst → docs/mdfreader/index.rst b/source/mdfreader/index.rst → docs/mdfreader/index.rst
diff --git a/Ui_mdfreaderui.py → mdfconverter/Ui_mdfreaderui.py b/Ui_mdfreaderui.py → mdfconverter/Ui_mdfreaderui.py
diff --git a/mdfconverter/__init__.py b/mdfconverter/__init__.py
@@ -0,0 +1,15 @@
+# ----------------------------------------------------------------------
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses.
+#
+# ----------------------------------------------------------------------
+__version__ = "0.1.3"
diff --git a/mdfconverter.py → mdfconverter/mdfconverter.py b/mdfconverter.py → mdfconverter/mdfconverter.py
diff --git a/mdfreaderui.py → mdfconverter/mdfreaderui.py b/mdfreaderui.py → mdfconverter/mdfreaderui.py
diff --git a/mdfreaderui.ui → mdfconverter/mdfreaderui.ui b/mdfreaderui.ui → mdfconverter/mdfreaderui.ui
diff --git a/mdfreader.e4p b/mdfreader.e4p
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project mdfreader -->
-<!-- Saved: 2015-04-10, 01:02:36 -->
+<!-- Saved: 2015-05-21, 22:22:18 -->
 <!-- Copyright (C) 2015 Aymeric Rateau, aymeric.rateau@gmail.com -->
 <Project version="5.1">
   <Language>en</Language>
@@ -14,29 +14,26 @@
   <Email>aymeric.rateau@gmail.com</Email>
   <Eol index="-1"/>
   <Sources>
-    <Source>mdfreader.py</Source>
+    <Source>mdfreader/mdfreader.py</Source>
     <Source>mdfForVeuszPlugin.py</Source>
-    <Source>mdfreaderui.py</Source>
-    <Source>Ui_mdfreaderui.py</Source>
-    <Source>mdfconverter.py</Source>
-    <Source>mdfinfo4.py</Source>
-    <Source>mdfinfo3.py</Source>
+    <Source>mdfconverter/mdfreaderui.py</Source>
+    <Source>mdfconverter/Ui_mdfreaderui.py</Source>
+    <Source>mdfconverter/mdfconverter.py</Source>
+    <Source>mdfreader/mdfinfo4.py</Source>
+    <Source>mdfreader/mdfinfo3.py</Source>
     <Source>test/test.py</Source>
-    <Source>mdf3reader.py</Source>
-    <Source>mdf4reader.py</Source>
+    <Source>mdfreader/mdf3reader.py</Source>
+    <Source>mdfreader/mdf4reader.py</Source>
     <Source>README</Source>
     <Source>LICENSE</Source>
     <Source>setup.py</Source>
   </Sources>
-  <Forms>
-    <Form>mdfreaderui.ui</Form>
-  </Forms>
+  <Forms/>
   <Translations/>
   <Resources/>
   <Interfaces/>
   <Others>
     <Other>.issues</Other>
-    <Other>doc</Other>
   </Others>
   <MainScript>mdfconverter.py</MainScript>
   <Vcs>

diff --git a/mdfreader/__init__.py b/mdfreader/__init__.py
@@ -0,0 +1,15 @@
+# ----------------------------------------------------------------------
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses.
+#
+# ----------------------------------------------------------------------
+__version__ = "0.1.3"
diff --git a/mdf3reader.py → mdfreader/mdf3reader.py b/mdf3reader.py → mdfreader/mdf3reader.py
diff --git a/mdf4reader.py → mdfreader/mdf4reader.py b/mdf4reader.py → mdfreader/mdf4reader.py
diff --git a/mdfinfo3.py → mdfreader/mdfinfo3.py b/mdfinfo3.py → mdfreader/mdfinfo3.py
diff --git a/mdfinfo4.py → mdfreader/mdfinfo4.py b/mdfinfo4.py → mdfreader/mdfinfo4.py
diff --git a/mdfreader.py → mdfreader/mdfreader.py b/mdfreader.py → mdfreader/mdfreader.py
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/development.html#single-sourcing-the-version
-    version='0.1.2',
+    version='0.1.3',
 
     description='A Measured Data Format file parser',
     long_description=long_description,