Skip to content

Commit

Permalink
fix packaging
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen L. <[email protected]>
  • Loading branch information
lrq3000 committed Dec 6, 2015
1 parent 2d0632c commit e5160bc
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 29 deletions.
7 changes: 6 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ include Makefile
include README.md
include README.rst
include TODO.md
include resiliency_tester_config.txt

# Libraries
recursive-include lib *.py
recursive-include lib *.pyx # Cython files

# Test suite
#recursive-include tests *.py
recursive-include tests *.py
recursive-include tests/files *.*
recursive-include tests/results *.*
include tox.ini
2 changes: 1 addition & 1 deletion _infos.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
__email__ = '[email protected]'

# Definition of the version number
version_info = 2, 0, 2 # major, minor, patch, extra
version_info = 2, 0, 3 # major, minor, patch, extra

# Nice string for the version (mimic how IPython composes its version str)
__version__ = '-'.join(map(str, version_info)).replace('-', '.').strip('-')
9 changes: 6 additions & 3 deletions tests/test_aux_funcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

from nose.tools import assert_raises

from StringIO import StringIO
import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

from StringIO import StringIO
import shutil

from .aux_tests import get_marker, dummy_ecc_file_gen, path_sample_files, create_dir_if_not_exist

from ..lib import aux_funcs as auxf
from ..lib.argparse import ArgumentTypeError
from lib import aux_funcs as auxf
from lib.argparse import ArgumentTypeError

def setup_module():
""" Initialize the tests by emptying the out directory """
Expand Down
7 changes: 5 additions & 2 deletions tests/test_eccman.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@

from nose.tools import assert_raises

import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import shutil
import os, sys
from StringIO import StringIO

from .aux_tests import get_marker, dummy_ecc_file_gen, check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, remove_if_exist

from ..lib.eccman import ECCMan, compute_ecc_params, detect_reedsolomon_parameters
from lib.eccman import ECCMan, compute_ecc_params, detect_reedsolomon_parameters

def setup_module():
""" Initialize the tests by emptying the out directory """
Expand Down
6 changes: 5 additions & 1 deletion tests/test_hasher.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

from nose.tools import assert_raises

import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import shutil

from .aux_tests import path_sample_files, create_dir_if_not_exist

from ..lib.hasher import Hasher
from lib.hasher import Hasher

def setup_module():
""" Initialize the tests by emptying the out directory """
Expand Down
12 changes: 7 additions & 5 deletions tests/test_header_ecc.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
from __future__ import print_function

import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import itertools
import hashlib

import sys

import shutil
from StringIO import StringIO

from pyFileFixity import header_ecc as hecc
from ..lib.aux_funcs import get_next_entry
from ..lib.eccman import compute_ecc_params, ECCMan
import header_ecc as hecc
from lib.aux_funcs import get_next_entry
from lib.eccman import compute_ecc_params, ECCMan
from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, get_marker, dummy_ecc_file_gen

def setup_module():
Expand Down
13 changes: 7 additions & 6 deletions tests/test_repair_ecc.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
from __future__ import print_function

import itertools
import hashlib

import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import itertools
import hashlib

import shutil

from pyFileFixity import repair_ecc as recc
from pyFileFixity import header_ecc as hecc
from pyFileFixity import structural_adaptive_ecc as saecc
import repair_ecc as recc
import header_ecc as hecc
import structural_adaptive_ecc as saecc
from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, get_marker

def get_db():
Expand Down
10 changes: 6 additions & 4 deletions tests/test_rfigc.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
from __future__ import print_function, with_statement

import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import itertools
import hashlib

import sys
import os
import shutil

from .. import rfigc
from ..lib.aux_funcs import recwalk
import rfigc
from lib.aux_funcs import recwalk
from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, create_dir_if_not_exist

def partial_eq(file, file_partial):
Expand Down
11 changes: 7 additions & 4 deletions tests/test_structural_adaptive_ecc.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
from __future__ import print_function

import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import itertools
import hashlib

import sys
import shutil
from StringIO import StringIO

from pyFileFixity import structural_adaptive_ecc as saecc
from pyFileFixity.lib.aux_funcs import get_next_entry
from ..lib.eccman import ECCMan
import structural_adaptive_ecc as saecc
from lib.aux_funcs import get_next_entry
from lib.eccman import ECCMan
from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, get_marker, dummy_ecc_file_gen

def setup_module():
Expand Down
7 changes: 5 additions & 2 deletions tests/test_tee.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
from __future__ import print_function

import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), '..'))

import shutil
import os, sys
from StringIO import StringIO

from .aux_tests import get_marker, dummy_ecc_file_gen, check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, remove_if_exist

from ..lib.tee import Tee
from lib.tee import Tee

def setup_module():
""" Initialize the tests by emptying the out directory """
Expand Down

0 comments on commit e5160bc

Please sign in to comment.