Merge pull request #32 from ehenneken/travis_deploy

project rearrange
adsabs · Oct 8, 2016 · 36d999e · 36d999e
2 parents a02f1a1 + 88b1740
commit 36d999e
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ python:
 install:
 - pip install -r requirements.txt
 script:
-- nosetests --with-coverage test
+- nosetests --with-coverage adsutils/test
 after_success:
 - coveralls
 deploy:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
 include *.md
-include data/*.dat
+include adsutils/data/*.dat
 include requirements.txt
diff --git a/adsutils/__init__.py b/adsutils/__init__.py
@@ -2,7 +2,7 @@
 
 """ A Python tool with some general ADS utilities """
 
-__version__ = "1.0.23"
+__version__ = "1.0.26"
 
 from ads_utils import make_bibcode
 from ads_utils import resolve_references

diff --git a/config/__init__.py → adsutils/config/__init__.py b/config/__init__.py → adsutils/config/__init__.py
diff --git a/config/config.py → adsutils/config/config.py b/config/config.py → adsutils/config/config.py
diff --git a/data/aps_abbrev.dat → adsutils/data/aps_abbrev.dat b/data/aps_abbrev.dat → adsutils/data/aps_abbrev.dat
diff --git a/data/bibstems.dat → adsutils/data/bibstems.dat b/data/bibstems.dat → adsutils/data/bibstems.dat
diff --git a/data/conferences.dat → adsutils/data/conferences.dat b/data/conferences.dat → adsutils/data/conferences.dat
diff --git a/data/conferences_abbrev.dat → adsutils/data/conferences_abbrev.dat b/data/conferences_abbrev.dat → adsutils/data/conferences_abbrev.dat
diff --git a/data/iop_elec.dat → adsutils/data/iop_elec.dat b/data/iop_elec.dat → adsutils/data/iop_elec.dat
diff --git a/data/journals.dat → adsutils/data/journals.dat b/data/journals.dat → adsutils/data/journals.dat
diff --git a/data/journals_abbrev.dat → adsutils/data/journals_abbrev.dat b/data/journals_abbrev.dat → adsutils/data/journals_abbrev.dat
diff --git a/data/needs_issue.dat → adsutils/data/needs_issue.dat b/data/needs_issue.dat → adsutils/data/needs_issue.dat
diff --git a/data/notinADS.dat → adsutils/data/notinADS.dat b/data/notinADS.dat → adsutils/data/notinADS.dat
diff --git a/data/preprints.dat → adsutils/data/preprints.dat b/data/preprints.dat → adsutils/data/preprints.dat
diff --git a/data/unicode.dat → adsutils/data/unicode.dat b/data/unicode.dat → adsutils/data/unicode.dat
diff --git a/examples/bibcode.py → adsutils/examples/bibcode.py b/examples/bibcode.py → adsutils/examples/bibcode.py
diff --git a/examples/resolver.py → adsutils/examples/resolver.py b/examples/resolver.py → adsutils/examples/resolver.py
diff --git a/examples/source_matcher.py → adsutils/examples/source_matcher.py b/examples/source_matcher.py → adsutils/examples/source_matcher.py
diff --git a/test/__init__.py → adsutils/test/__init__.py b/test/__init__.py → adsutils/test/__init__.py
diff --git a/test/nosetests.py → adsutils/test/nosetests.py b/test/nosetests.py → adsutils/test/nosetests.py
diff --git a/test/test_bibcode.py → adsutils/test/test_bibcode.py b/test/test_bibcode.py → adsutils/test/test_bibcode.py
diff --git a/test/test_resolver.py → adsutils/test/test_resolver.py b/test/test_resolver.py → adsutils/test/test_resolver.py
diff --git a/test/test_source_matcher.py → adsutils/test/test_source_matcher.py b/test/test_source_matcher.py → adsutils/test/test_source_matcher.py
diff --git a/setup.py b/setup.py
@@ -34,8 +34,8 @@ def readfile(filename):
     url = 'http://github.com/adsabs/adsutils',
     license="MIT",
     description="A Python tool with some general ADS utilities",
-    packages = ['adsutils', 'test' ,'config', 'data', 'examples'],
-    data_files= [('data', ['aps_abbrev.dat','bibstems.dat','conferences.dat','conferences_abbrev.dat','iop_elec.dat','journals.dat','journals_abbrev.dat','needs_issue.dat','notinADS.dat','preprints.dat','unicode.dat'])],
+    packages = ['adsutils'],
+    data_files= [('adsutils/data', ['aps_abbrev.dat','bibstems.dat','conferences.dat','conferences_abbrev.dat','iop_elec.dat','journals.dat','journals_abbrev.dat','needs_issue.dat','notinADS.dat','preprints.dat','unicode.dat'])],
     classifiers = [
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',