Merge pull request #27 from sot/de-namespace

De namespace

.gitignore

@@ -1,4 +1,4 @@
-Ska.Shell.egg-info/
+ska_shell.egg-info/
 build/
 _build/
 dist/

docs/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Ska.Shell documentation build configuration file, created by
+# ska_shell documentation build configuration file, created by
 # sphinx-quickstart on Thu May 23 10:58:30 2013.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -46,7 +46,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Ska.Shell'
+project = u'ska_shell'
 copyright = u'2013, Tom Aldcroft'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -100,8 +100,8 @@
 html_theme = 'bootstrap-ska'
 html_theme_options = {
     'logotext1': 'Ska!' ,
-    'logotext2': 'Ska',
-    'logotext3': '.Shell',
+    'logotext2': 'ska_shell',
+    'logotext3': '',
     'homepage_url': 'https://cxc.cfa.harvard.edu/mta/ASPECT/tool_doc',
     'homepage_text': 'ska',
     'homepage_text_2': 'tools'
@@ -197,7 +197,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'SkaShell.tex', u'Ska.Shell Documentation',
+  ('index', 'SkaShell.tex', u'ska_shell Documentation',
    u'Tom Aldcroft', 'manual'),
 ]
 
@@ -227,7 +227,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'skashell', u'Ska.Shell Documentation',
+    ('index', 'skashell', u'ska_shell Documentation',
      [u'Tom Aldcroft'], 1)
 ]
 
@@ -241,7 +241,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'SkaShell', u'Ska.Shell Documentation',
+  ('index', 'SkaShell', u'ska_shell Documentation',
    u'Tom Aldcroft', 'SkaShell', 'One line description of project.',
    'Miscellaneous'),
 ]

docs/index.rst

@@ -1,12 +1,12 @@
-.. Ska.Shell documentation master file, created by
+.. ska_shell documentation master file, created by
    sphinx-quickstart on Thu May 23 10:58:30 2013.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to Ska.Shell's documentation!
+Welcome to ska_shell's documentation!
 =====================================
 
-.. automodule:: Ska.Shell
+.. automodule:: ska_shell
 
 Functions
 ----------

setup.py

@@ -1,19 +1,27 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 from setuptools import setup
 
-try:
-    from testr.setup_helper import cmdclass
-except ImportError:
-    cmdclass = {}
+from ska_helpers.setup_helper import duplicate_package_info
+from testr.setup_helper import cmdclass
 
-setup(name='Ska.Shell',
+name = "ska_shell"
+namespace = "Ska.Shell"
+
+packages = ["ska_shell", "ska_shell.tests"]
+package_dir = {name: name}
+
+duplicate_package_info(packages, name, namespace)
+duplicate_package_info(package_dir, name, namespace)
+
+setup(name=name,
       author='Tom Aldcroft',
       description='Various shell utilities',
       author_email='taldcroft@cfa.harvard.edu',
       use_scm_version=True,
       setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
       zip_safe=False,
-      packages=['Ska', 'Ska.Shell', 'Ska.Shell.tests'],
+      packages=packages,
+      package_dir=package_dir,
       tests_require=['pytest'],
       cmdclass=cmdclass,
       )

Ska/Shell/__init__.py → ska_shell/__init__.py

@@ -3,7 +3,7 @@
 
 from .shell import *
 
-__version__ = ska_helpers.get_version('Ska.Shell')
+__version__ = ska_helpers.get_version('ska_shell')
 
 
 def test(*args, **kwargs):

Ska/Shell/shell.py → ska_shell/shell.py

@@ -320,7 +320,7 @@ class Spawn(object):
 
     Example usage:
 
-      >>> from Ska.Shell import Spawn, bash, getenv, importenv
+      >>> from ska_shell import Spawn, bash, getenv, importenv
       >>>
       >>> spawn = Spawn()
       >>> status = spawn.run(['echo', 'hello'])

Ska/Shell/tests/test_shell.py → ska_shell/tests/test_shell.py

@@ -2,15 +2,15 @@
 import os
 import pytest
 from six.moves import cStringIO as StringIO
-from Ska.Shell import (Spawn, RunTimeoutError, bash, tcsh, getenv, importenv,
+from ska_shell import (Spawn, RunTimeoutError, bash, tcsh, getenv, importenv,
                        tcsh_shell, bash_shell)
 
 HAS_HEAD_CIAO = os.path.exists('/soft/ciao/bin/ciao.sh')
 
 outfile = 'ska_shell_test.dat'
 
 # Skip the entire test suite on Windows
-pytestmark = pytest.mark.skipif(os.name == 'nt', reason='Ska.Shell not supported on Windows')
+pytestmark = pytest.mark.skipif(os.name == 'nt', reason='ska_shell not supported on Windows')
 
 
 class TestSpawn: