Revert

mfcovington · Jan 22, 2016 · 1123cb9 · 1123cb9
1 parent 8c83507
commit 1123cb9
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 88 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,9 @@ language: python
 python:
   - "3.3"
   - "3.4"
-before_install:
-  - pip install --upgrade pip
-  - pip install 'coverage<4'
-  - pip freeze
+before_install: pip install --upgrade pip
 install:
   - pip install -e .
   - pip install coveralls
-  - pip freeze
-  # - which pubmed-citation
-  # - pubmed-citation 22331878
 script: coverage run --source=pubmed_lookup setup.py test
 after_success: coveralls
diff --git a/pubmed_lookup/test_pubmed_lookup.py b/pubmed_lookup/test_pubmed_lookup.py
@@ -3,81 +3,57 @@
 import unittest
 from io import StringIO
 
-# import pubmed_lookup.command_line
-from pubmed_lookup import command_line, Publication, PubMedLookup
-
-
-# class TestConsole(unittest.TestCase):
-#     """Test command-line tools."""
-
-#     def setUp(self):
-#         if 'TRAVIS' in os.environ and os.environ['TRAVIS'] == 'true':
-#             self.skipTest('Skipping this test on Travis CI.')
-#             print("SKIPPING")
-
-#         print("RUNNING")
-
-#         self.out = StringIO()
-#         self.pmid = '22331878'
-
-#         self.citation = (
-#             'Goodspeed D, Chehab EW, Min-Venditti A, Braam J, Covington MF '
-#             '(2012). Arabidopsis synchronizes jasmonate-mediated defense with '
-#             'insect circadian behavior. Proc Natl Acad Sci U S A 109(12): '
-#             '4674-7.')
-#         self.mini_citation = (
-#             'Goodspeed D - Covington MF - 2012 - Proc Natl Acad Sci U S A')
-
-#         self.article_url = 'http://www.pnas.org/content/109/12/4674'
-#         self.doi_url = 'http://dx.doi.org/10.1073/pnas.1116368109'
-
-#     @unittest.skipIf(
-#         "TRAVIS" in os.environ and os.environ["TRAVIS"] == 'true',
-#         "Skipping this test on Travis CI.")
-#     def test_pubmed_citation(self):
-#         command_line.pubmed_citation([self.pmid], out=self.out)
-#         output = self.out.getvalue()
-#         self.assertEqual(output, self.citation + '\n')
-
-#     @unittest.skipIf(
-#         "TRAVIS" in os.environ and os.environ["TRAVIS"] == 'true',
-#         "Skipping this test on Travis CI.")
-#     def test_pubmed_citation_m(self):
-#         command_line.pubmed_citation(['-m', self.pmid], out=self.out)
-#         output = self.out.getvalue()
-#         self.assertEqual(output, self.mini_citation + '\n')
-
-#     @unittest.skipIf(
-#         "TRAVIS" in os.environ and os.environ["TRAVIS"] == 'true',
-#         "Skipping this test on Travis CI.")
-#     def test_pubmed_citation_mini(self):
-#         command_line.pubmed_citation(['--mini', self.pmid], out=self.out)
-#         output = self.out.getvalue()
-#         self.assertEqual(output, self.mini_citation + '\n')
-
-#     @unittest.skipIf(
-#         "TRAVIS" in os.environ and os.environ["TRAVIS"] == 'true',
-#         "Skipping this test on Travis CI.")
-#     def test_pubmed_url(self):
-#         command_line.pubmed_url([self.pmid], out=self.out)
-#         output = self.out.getvalue()
-#         self.assertEqual(output, self.article_url + '\n')
-
-#     @unittest.skipIf(
-#         "TRAVIS" in os.environ and os.environ["TRAVIS"] == 'true',
-#         "Skipping this test on Travis CI.")
-#     def test_pubmed_url_d(self):
-#         command_line.pubmed_url(['-d', self.pmid], out=self.out)
-#         output = self.out.getvalue()
-#         self.assertEqual(output, self.doi_url + '\n')
-
-#     @unittest.skipIf(
-#         "TRAVIS" in os.environ and os.environ["TRAVIS"] == 'true',
-#         "Skipping this test on Travis CI.")
-#     def test_pubmed_url_doi(self):
-#         command_line.pubmed_url(['--doi', self.pmid], out=self.out)
-#         output = self.out.getvalue()
-#         self.assertEqual(output, self.doi_url + '\n')
+import command_line
+from pubmed_lookup import Publication, PubMedLookup
+
+
+class TestConsole(unittest.TestCase):
+    """Test command-line tools."""
+
+    def setUp(self):
+        self.out = StringIO()
+        self.pmid = '22331878'
+
+        self.citation = (
+            'Goodspeed D, Chehab EW, Min-Venditti A, Braam J, Covington MF '
+            '(2012). Arabidopsis synchronizes jasmonate-mediated defense with '
+            'insect circadian behavior. Proc Natl Acad Sci U S A 109(12): '
+            '4674-7.')
+        self.mini_citation = (
+            'Goodspeed D - Covington MF - 2012 - Proc Natl Acad Sci U S A')
+
+        self.article_url = 'http://www.pnas.org/content/109/12/4674'
+        self.doi_url = 'http://dx.doi.org/10.1073/pnas.1116368109'
+
+    def test_pubmed_citation(self):
+        command_line.pubmed_citation([self.pmid], out=self.out)
+        output = self.out.getvalue()
+        self.assertEqual(output, self.citation + '\n')
+
+    def test_pubmed_citation_m(self):
+        command_line.pubmed_citation(['-m', self.pmid], out=self.out)
+        output = self.out.getvalue()
+        self.assertEqual(output, self.mini_citation + '\n')
+
+    def test_pubmed_citation_mini(self):
+        command_line.pubmed_citation(['--mini', self.pmid], out=self.out)
+        output = self.out.getvalue()
+        self.assertEqual(output, self.mini_citation + '\n')
+
+    def test_pubmed_url(self):
+        command_line.pubmed_url([self.pmid], out=self.out)
+        output = self.out.getvalue()
+        self.assertEqual(output, self.article_url + '\n')
+
+    def test_pubmed_url_d(self):
+        command_line.pubmed_url(['-d', self.pmid], out=self.out)
+        output = self.out.getvalue()
+        self.assertEqual(output, self.doi_url + '\n')
+
+    def test_pubmed_url_doi(self):
+        command_line.pubmed_url(['--doi', self.pmid], out=self.out)
+        output = self.out.getvalue()
+        self.assertEqual(output, self.doi_url + '\n')
 
 
 class TestPublication(unittest.TestCase):

diff --git a/setup.py b/setup.py
@@ -47,10 +47,10 @@ def read(*paths):
         'Programming Language :: Python :: 3 :: Only',
     ],
     install_requires=install_requires,
-    # entry_points={
-    #     'console_scripts': [
-            # 'pubmed-citation=pubmed_lookup.command_line:pubmed_citation',
-            # 'pubmed-url=pubmed_lookup.command_line:pubmed_url',
-    #     ],
-    # },
+    entry_points={
+        'console_scripts': [
+            'pubmed-citation=pubmed_lookup.command_line:pubmed_citation',
+            'pubmed-url=pubmed_lookup.command_line:pubmed_url',
+        ],
+    },
 )