Moved tests dir from package to project root

Removed tests package Replaced pkg_resources with __file__ Replaced pkg_resources with __file__ Removed pkg_resources Removed pkg_resources 0.8.4 changes
mandeep · Jul 26, 2017 · 30800c4 · 30800c4
1 parent 4eea38a
commit 30800c4
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 37 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -3,4 +3,4 @@ omit =
     setup.py
     mausoleum/__main__.py
     */__init__.py
-    mausoleum/tests/*
+    tests/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,39 @@
-after_success:
-- coveralls
+notifications:
+  email: false
+
+dist: trusty
+sudo: required
+
+language: python
+python:
+- '3.5'
+- '3.6'
+
 before_install:
 - sudo apt-get update
 - sudo apt-get install -y zsh gnupg cryptsetup pinentry-curses steghide qrencode
   gawk
+
+install:
+- wget https://files.dyne.org/tomb/old-releases/Tomb-2.2.tar.gz
+- tar xvfz Tomb-2.2.tar.gz
+- pushd tomb-2.2 && sudo make install && popd
+- pip install pyqt5
+- pip install coverage
+- pip install coveralls
+- pip install pytest
+- pip install pytest-cov
+- pip install pytest-mock
+- pip install pytest-qt
+- pip install pytest-xvfb
+- python setup.py install
+
+script:
+- pytest -v --cov=./
+
+after_success:
+- coveralls
+
 deploy:
   true:
     branch: master
@@ -12,26 +42,3 @@ deploy:
     secure: "Zq9BTLd1Ya/ZKbicIg4uXMcNfVoPX5dN+RnOgDXdRbQDGtB7OO3zmKC8P/KbtyFiI5bUHdilUzRA4rig/PSHY/guztDNmn20GwSowoSAx9jF/ouhhsRypjnA9QJzWuBLQTDmDtU7ETGriNOyxtxP0y/SF5diuwHmhaf8iyxFposIs6TtQenFF2HT5+0AFIn8eWG/+gK17vERkrq+ar1a2dbCwWTarS/z+GnE1hGh9Ym89LHza9ULyiTnMxd30srX17T4Oiq7N8OIY5L4QobtgctMcKH7NArcLwtE10KrPKDB2tjp4+DLBDKXO/jHuhg9LxDeiirgLGWLJwFAGUGhY3wP74tw7B6rVfUGSEDxVktq5FjCZGXmCm4pJuDb/FeHfxJGzhFYvTMwZFhxmnzoHBFQLE6QH9cmzrvPeYQr9KRsICQ+MwKKVul68PKppeRFqPQfcH/wPizULU7+fDdlwdqNjjlHvZFwk6Efc2M4XpTr2qpPMjY68Q7V3Fr0zI1E0AwEIpseLVfhlkqXdygvK50utaUqQEXS21Iu8RBqKKUBUm7DsjgTlIsQrtFnZkbq+R3tdns8NWj1qQ1uEO7XG3QHulmCc/zeay1WUvPVUQ7UrXexqtnvKJJt/FJckvM6QXK/UCsMcknnIrhYFQKX++fPnhEoS1W2q/0+l07ZgrY="
   provider: pypi
   distributions: sdist bdist_wheel
-dist: trusty
-install:
-- wget https://files.dyne.org/tomb/old-releases/Tomb-2.2.tar.gz
-- tar xvfz Tomb-2.2.tar.gz
-- pushd tomb-2.2 && sudo make install && popd
-- pip3 install pyqt5
-- python setup.py install
-- pip3 install coverage
-- pip3 install coveralls
-- pip3 install pytest
-- pip3 install pytest-cov
-- pip3 install pytest-mock
-- pip3 install pytest-qt
-- pip3 install pytest-xvfb
-language: python
-notifications:
-  email: false
-python:
-- '3.5'
-- '3.6'
-script:
-- py.test -s -v --cov=./
-sudo: required
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,11 @@ Additions
 
 -  Ability to minimize to system tray
 
+0.8.4 - 2017-07-25
+==================
+
+-  Moved tests directory from the package directory to the project root directory
+
 0.8.3 - 2017-06-07
 ==================
 

diff --git a/mausoleum/tests/test.jpg b/mausoleum/tests/test.jpg
diff --git a/pytest.ini b/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-testpaths = mausoleum/tests/
+testpaths = tests/
diff --git a/setup.py b/setup.py
@@ -3,15 +3,14 @@
 
 setup(
     name='mausoleum',
-    version='0.8.3',
+    version='0.8.4',
     description='A Python GUI, CLI, and wrapper for Tomb',
     author='Mandeep',
     author_email='info@mandeep.xyz',
     license='GPLv3+',
     url='https://github.com/mandeep/Mausoleum',
-    packages=['mausoleum', 'mausoleum.images',
-              'mausoleum.tests'],
-    package_data={'mausoleum.images': ['*.png'], 'mausoleum': ['*.toml'], 'mausoleum.tests': ['*.jpg']},
+    packages=['mausoleum', 'mausoleum.images'],
+    package_data={'mausoleum.images': ['*.png'], 'mausoleum': ['*.toml']},
     entry_points={
         'console_scripts': [
             'mausoleum-gui=mausoleum.application:main',

diff --git a/mausoleum/tests/__init__.py → tests/__init__.py b/mausoleum/tests/__init__.py → tests/__init__.py
diff --git a/tests/test.jpg b/tests/test.jpg
diff --git a/mausoleum/tests/test_application.py → tests/test_application.py b/mausoleum/tests/test_application.py → tests/test_application.py
@@ -1,8 +1,7 @@
-import pkg_resources
-
-import pytest
+import os
 
 from PyQt5.QtCore import Qt
+import pytest
 
 from mausoleum import application
 
@@ -41,7 +40,7 @@ def password():
 @pytest.fixture
 def image_file():
     """Pass a JPEG file resource as an argument to the unit tests."""
-    file = pkg_resources.resource_filename('mausoleum.tests', 'test.jpg')
+    file = os.path.join(os.path.dirname(__file__), 'test.jpg')
     return file
 
 

diff --git a/mausoleum/tests/test_wrapper.py → tests/test_wrapper.py b/mausoleum/tests/test_wrapper.py → tests/test_wrapper.py
@@ -1,4 +1,4 @@
-import pkg_resources
+import os
 
 from click.testing import CliRunner
 import pytest
@@ -27,7 +27,7 @@ def password():
 @pytest.fixture
 def image_file():
     """Pass a JPEG file resource as an argument to the unit tests."""
-    file = pkg_resources.resource_filename('mausoleum.tests', 'test.jpg')
+    file = os.path.join(os.path.dirname(__file__), 'test.jpg')
     return file