Merge pull request #30 from ccordoba12/fix-tests

PR: Fix tests

MANIFEST.in

@@ -2,6 +2,4 @@ include CHANGELOG.md
 include CONTRIBUTORS.md
 include LICENSE.txt
 include README.rst
-include versioneer.py
-include spyder_terminal/_version.py
-recursive-include spyder_terminal/server/static/ *
+recursive-include spyder_terminal/server/static/ *.html *.js *.json *.css *.eot *.tff *.woff *.woff2

circle.yml

@@ -11,14 +11,13 @@ machine:
     TRAVIS_OS_NAME: "linux"
     CONDA_DEPENDENCIES_FLAGS: "--quiet"
     CONDA_DEPENDENCIES: "pytest pytest-cov"
-    PIP_DEPENDENCIES: "coveralls pytest-qt pytest-xvfb"
+    PIP_DEPENDENCIES: "coveralls coloredlogs pytest-qt pytest-xvfb"
 
 dependencies:
   pre:
     # We need to run a window manager to avoid focus problems when running our tests.
     # See https://github.com/TestFX/TestFX/issues/158#issuecomment-62421691
     - sudo apt-get install matchbox-window-manager
-    - sudo npm install bower
   override:
     # First convert PY_VERSIONS to an array and then select the python version based on the CIRCLE_NODE_INDEX
     - export PY_VERSIONS=($PY_VERSIONS) &&
@@ -29,20 +28,21 @@ dependencies:
       export PATH="$HOME/miniconda/bin:$PATH" &&
       source activate test &&
       conda install -q ciocheck -c spyder-ide --no-update-deps &&
-      if [ "$CIRCLE_NODE_INDEX" = "2" ]; then pip install -q pyqt5 spyder tornado pexpect coloredlogs; else conda install -q spyder tornado pexpect coloredlogs; fi &&
-      python setup.py install > /dev/null;
+      if [ "$CIRCLE_NODE_INDEX" = "2" ]; then pip install -q pyqt5 spyder tornado pexpect; else conda install -q spyder tornado pexpect; fi &&
+      python setup.py build_static &&
+      pip install .;
     - DISPLAY=:99 /usr/bin/matchbox-window-manager:
         background: true
     - sleep 5
 
 test:
   override:
     # Style checks
-    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && ciocheck spyder_notebook: # note the colon
+    - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && ciocheck spyder_terminal: # note the colon
         parallel: true
     # Tests
     - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && python runtests.py: # note the colon
         parallel: true
     # Coveralls
     - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && coveralls: # note the colon
-parallel: true
+        parallel: true

setup.cfg

@@ -1,17 +1,5 @@
 [bdist_wheel]
 universal=1
 
-
-# See the docstring in versioneer.py for instructions. Note that you must
-# re-run 'versioneer.py setup' after changing this section, and commit the
-# resulting files.
-
-[versioneer]
-VCS = git
-style = pep440
-versionfile_source = spyder_terminal/_version.py
-versionfile_build = spyder_terminal/_version.py
-tag_prefix = v
-
 [aliases]
 install = build_static install

setup.py

@@ -12,12 +12,15 @@
 
 # Third party imports
 from setuptools import find_packages, setup
-import versioneer
 
 from setupbase import (DevelopWithBuildStatic,
                        SdistWithBuildStatic,
                        BuildStatic)
 
+# Loca imports
+from spyder_terminal import __version__
+
+
 HERE = os.path.abspath(os.path.dirname(__file__))
 
 
@@ -36,13 +39,10 @@ def get_description():
     'sdist': SdistWithBuildStatic
 }
 
-ver_cmd = versioneer.get_cmdclass()
-cmdclass.update(ver_cmd)
 
 setup(
     name='spyder_terminal',
-    version=versioneer.get_version(),
-    # cmdclass=versioneer.get_cmdclass(),
+    version=__version__,
     cmdclass=cmdclass,
     keywords=['Spyder', 'Plugin'],
     url='https://github.com/spyder-ide/spyder-ide',
@@ -56,7 +56,7 @@ def get_description():
     install_requires=REQUIREMENTS,
     include_package_data=True,
     classifiers=[
-        'Development Status :: 1 - Planning',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: MIT License',

spyder_terminal/__init__.py

@@ -7,12 +7,7 @@
 # -----------------------------------------------------------------------------
 """Spyder Terminal Plugin."""
 
-from ._version import get_versions
 from .terminalplugin import TerminalPlugin as PLUGIN_CLASS
 
-__version__ = get_versions()['version']
-del get_versions
-
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
+VERSION_INFO = (0, 1, 0, 'dev0')
+__version__ = '.'.join(map(str, VERSION_INFO))