Moved hamcrest into src/

hamcrest · Oct 18, 2013 · 29d4f9d · 29d4f9d
1 parent aa93a37
commit 29d4f9d
Show file tree

Hide file tree

Showing 58 changed files with 4 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@ def read(fname):
 
 # On Python 3, we can't "from hamcrest import __version__" (get ImportError),
 # so we extract the variable assignment and execute it ourselves.
-fh = open(local('hamcrest/__init__.py'))
+fh = open(local('src/hamcrest/__init__.py'))
 try:
     for line in fh:
         if re.match('__version__.*', line):
@@ -41,7 +41,8 @@ def read(fname):
     keywords='hamcrest matchers pyunit unit test testing unittest unittesting',
     url='https://github.com/hamcrest/PyHamcrest',
     download_url='http://pypi.python.org/packages/source/P/PyHamcrest/PyHamcrest-%s.tar.gz' % __version__,
-    packages=find_packages(),
+    packages=find_packages('src'),
+    package_dir = {'': 'src'},
     provides=['hamcrest'],
     long_description=read('README.rst'),
     install_requires=['setuptools'],

diff --git a/hamcrest/__init__.py → src/hamcrest/__init__.py b/hamcrest/__init__.py → src/hamcrest/__init__.py
diff --git a/hamcrest/core/__init__.py → src/hamcrest/core/__init__.py b/hamcrest/core/__init__.py → src/hamcrest/core/__init__.py
diff --git a/hamcrest/core/assert_that.py → src/hamcrest/core/assert_that.py b/hamcrest/core/assert_that.py → src/hamcrest/core/assert_that.py
diff --git a/hamcrest/core/base_description.py → src/hamcrest/core/base_description.py b/hamcrest/core/base_description.py → src/hamcrest/core/base_description.py
diff --git a/hamcrest/core/base_matcher.py → src/hamcrest/core/base_matcher.py b/hamcrest/core/base_matcher.py → src/hamcrest/core/base_matcher.py
diff --git a/hamcrest/core/compat.py → src/hamcrest/core/compat.py b/hamcrest/core/compat.py → src/hamcrest/core/compat.py
diff --git a/hamcrest/core/core/__init__.py → src/hamcrest/core/core/__init__.py b/hamcrest/core/core/__init__.py → src/hamcrest/core/core/__init__.py
diff --git a/hamcrest/core/core/allof.py → src/hamcrest/core/core/allof.py b/hamcrest/core/core/allof.py → src/hamcrest/core/core/allof.py
diff --git a/hamcrest/core/core/anyof.py → src/hamcrest/core/core/anyof.py b/hamcrest/core/core/anyof.py → src/hamcrest/core/core/anyof.py
diff --git a/hamcrest/core/core/described_as.py → src/hamcrest/core/core/described_as.py b/hamcrest/core/core/described_as.py → src/hamcrest/core/core/described_as.py
diff --git a/hamcrest/core/core/is_.py → src/hamcrest/core/core/is_.py b/hamcrest/core/core/is_.py → src/hamcrest/core/core/is_.py
diff --git a/hamcrest/core/core/isanything.py → src/hamcrest/core/core/isanything.py b/hamcrest/core/core/isanything.py → src/hamcrest/core/core/isanything.py
diff --git a/hamcrest/core/core/isequal.py → src/hamcrest/core/core/isequal.py b/hamcrest/core/core/isequal.py → src/hamcrest/core/core/isequal.py
diff --git a/hamcrest/core/core/isinstanceof.py → src/hamcrest/core/core/isinstanceof.py b/hamcrest/core/core/isinstanceof.py → src/hamcrest/core/core/isinstanceof.py
diff --git a/hamcrest/core/core/isnone.py → src/hamcrest/core/core/isnone.py b/hamcrest/core/core/isnone.py → src/hamcrest/core/core/isnone.py
diff --git a/hamcrest/core/core/isnot.py → src/hamcrest/core/core/isnot.py b/hamcrest/core/core/isnot.py → src/hamcrest/core/core/isnot.py
diff --git a/hamcrest/core/core/issame.py → src/hamcrest/core/core/issame.py b/hamcrest/core/core/issame.py → src/hamcrest/core/core/issame.py
diff --git a/hamcrest/core/core/raises.py → src/hamcrest/core/core/raises.py b/hamcrest/core/core/raises.py → src/hamcrest/core/core/raises.py
diff --git a/hamcrest/core/description.py → src/hamcrest/core/description.py b/hamcrest/core/description.py → src/hamcrest/core/description.py
diff --git a/hamcrest/core/helpers/__init__.py → src/hamcrest/core/helpers/__init__.py b/hamcrest/core/helpers/__init__.py → src/hamcrest/core/helpers/__init__.py
diff --git a/hamcrest/core/helpers/hasmethod.py → src/hamcrest/core/helpers/hasmethod.py b/hamcrest/core/helpers/hasmethod.py → src/hamcrest/core/helpers/hasmethod.py
diff --git a/hamcrest/core/helpers/wrap_matcher.py → src/hamcrest/core/helpers/wrap_matcher.py b/hamcrest/core/helpers/wrap_matcher.py → src/hamcrest/core/helpers/wrap_matcher.py
diff --git a/hamcrest/core/matcher.py → src/hamcrest/core/matcher.py b/hamcrest/core/matcher.py → src/hamcrest/core/matcher.py
diff --git a/hamcrest/core/selfdescribing.py → src/hamcrest/core/selfdescribing.py b/hamcrest/core/selfdescribing.py → src/hamcrest/core/selfdescribing.py
diff --git a/hamcrest/core/selfdescribingvalue.py → src/hamcrest/core/selfdescribingvalue.py b/hamcrest/core/selfdescribingvalue.py → src/hamcrest/core/selfdescribingvalue.py
diff --git a/hamcrest/core/string_description.py → src/hamcrest/core/string_description.py b/hamcrest/core/string_description.py → src/hamcrest/core/string_description.py
diff --git a/hamcrest/library/__init__.py → src/hamcrest/library/__init__.py b/hamcrest/library/__init__.py → src/hamcrest/library/__init__.py
diff --git a/hamcrest/library/collection/__init__.py → src/hamcrest/library/collection/__init__.py b/hamcrest/library/collection/__init__.py → src/hamcrest/library/collection/__init__.py
diff --git a/hamcrest/library/collection/is_empty.py → src/hamcrest/library/collection/is_empty.py b/hamcrest/library/collection/is_empty.py → src/hamcrest/library/collection/is_empty.py
diff --git a/...t/library/collection/isdict_containing.py → ...t/library/collection/isdict_containing.py b/...t/library/collection/isdict_containing.py → ...t/library/collection/isdict_containing.py
diff --git a/...ry/collection/isdict_containingentries.py → ...ry/collection/isdict_containingentries.py b/...ry/collection/isdict_containingentries.py → ...ry/collection/isdict_containingentries.py
diff --git a/...ibrary/collection/isdict_containingkey.py → ...ibrary/collection/isdict_containingkey.py b/...ibrary/collection/isdict_containingkey.py → ...ibrary/collection/isdict_containingkey.py
diff --git a/...rary/collection/isdict_containingvalue.py → ...rary/collection/isdict_containingvalue.py b/...rary/collection/isdict_containingvalue.py → ...rary/collection/isdict_containingvalue.py
diff --git a/hamcrest/library/collection/isin.py → src/hamcrest/library/collection/isin.py b/hamcrest/library/collection/isin.py → src/hamcrest/library/collection/isin.py
diff --git a/...brary/collection/issequence_containing.py → ...brary/collection/issequence_containing.py b/...brary/collection/issequence_containing.py → ...brary/collection/issequence_containing.py
diff --git a/...ection/issequence_containinginanyorder.py → ...ection/issequence_containinginanyorder.py b/...ection/issequence_containinginanyorder.py → ...ection/issequence_containinginanyorder.py
diff --git a/...ollection/issequence_containinginorder.py → ...ollection/issequence_containinginorder.py b/...ollection/issequence_containinginorder.py → ...ollection/issequence_containinginorder.py
diff --git a/...y/collection/issequence_onlycontaining.py → ...y/collection/issequence_onlycontaining.py b/...y/collection/issequence_onlycontaining.py → ...y/collection/issequence_onlycontaining.py
diff --git a/hamcrest/library/integration/__init__.py → src/hamcrest/library/integration/__init__.py b/hamcrest/library/integration/__init__.py → src/hamcrest/library/integration/__init__.py
diff --git a/...est/library/integration/match_equality.py → ...est/library/integration/match_equality.py b/...est/library/integration/match_equality.py → ...est/library/integration/match_equality.py
diff --git a/hamcrest/library/number/__init__.py → src/hamcrest/library/number/__init__.py b/hamcrest/library/number/__init__.py → src/hamcrest/library/number/__init__.py
diff --git a/hamcrest/library/number/iscloseto.py → src/hamcrest/library/number/iscloseto.py b/hamcrest/library/number/iscloseto.py → src/hamcrest/library/number/iscloseto.py
diff --git a/...est/library/number/ordering_comparison.py → ...est/library/number/ordering_comparison.py b/...est/library/number/ordering_comparison.py → ...est/library/number/ordering_comparison.py
diff --git a/hamcrest/library/object/__init__.py → src/hamcrest/library/object/__init__.py b/hamcrest/library/object/__init__.py → src/hamcrest/library/object/__init__.py
diff --git a/hamcrest/library/object/haslength.py → src/hamcrest/library/object/haslength.py b/hamcrest/library/object/haslength.py → src/hamcrest/library/object/haslength.py
diff --git a/hamcrest/library/object/hasproperty.py → src/hamcrest/library/object/hasproperty.py b/hamcrest/library/object/hasproperty.py → src/hamcrest/library/object/hasproperty.py
diff --git a/hamcrest/library/object/hasstring.py → src/hamcrest/library/object/hasstring.py b/hamcrest/library/object/hasstring.py → src/hamcrest/library/object/hasstring.py
diff --git a/hamcrest/library/text/__init__.py → src/hamcrest/library/text/__init__.py b/hamcrest/library/text/__init__.py → src/hamcrest/library/text/__init__.py
diff --git a/...est/library/text/isequal_ignoring_case.py → ...est/library/text/isequal_ignoring_case.py b/...est/library/text/isequal_ignoring_case.py → ...est/library/text/isequal_ignoring_case.py
diff --git a/...brary/text/isequal_ignoring_whitespace.py → ...brary/text/isequal_ignoring_whitespace.py b/...brary/text/isequal_ignoring_whitespace.py → ...brary/text/isequal_ignoring_whitespace.py
diff --git a/hamcrest/library/text/stringcontains.py → src/hamcrest/library/text/stringcontains.py b/hamcrest/library/text/stringcontains.py → src/hamcrest/library/text/stringcontains.py
diff --git a/...est/library/text/stringcontainsinorder.py → ...est/library/text/stringcontainsinorder.py b/...est/library/text/stringcontainsinorder.py → ...est/library/text/stringcontainsinorder.py
diff --git a/hamcrest/library/text/stringendswith.py → src/hamcrest/library/text/stringendswith.py b/hamcrest/library/text/stringendswith.py → src/hamcrest/library/text/stringendswith.py
diff --git a/hamcrest/library/text/stringmatches.py → src/hamcrest/library/text/stringmatches.py b/hamcrest/library/text/stringmatches.py → src/hamcrest/library/text/stringmatches.py
diff --git a/hamcrest/library/text/stringstartswith.py → ...hamcrest/library/text/stringstartswith.py b/hamcrest/library/text/stringstartswith.py → ...hamcrest/library/text/stringstartswith.py
diff --git a/hamcrest/library/text/substringmatcher.py → ...hamcrest/library/text/substringmatcher.py b/hamcrest/library/text/substringmatcher.py → ...hamcrest/library/text/substringmatcher.py
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py32,py33,pypy
+envlist = py25,py26,py27,py32,py33,pypy
 # envlist = py26,py27,py27-numpy,py32,py33,py33-numpy,pypy
 # Jython is not testable, but there's no reason it should not work.
 # py25 and py31 are deprecated as of 1.7.2