Merge pull request #83 from ionelmc/master

Fix support for coverage 4.0b1

coveralls/api.py

@@ -159,7 +159,10 @@ def create_data(self, extra=None):
     def get_coverage(self):
         workman = coverage.coverage(config_file=self.config.get('config_file', True))
         workman.load()
-        workman._harvest_data()
+        if hasattr(workman, '_harvest_data'):
+            workman._harvest_data()
+        else:
+            workman.get_data()
         reporter = CoverallReporter(workman, workman.config)
         return reporter.report()
 

coveralls/reporter.py

@@ -21,19 +21,23 @@ def report(self, morfs=None):
         `outfile` is a file object to write the json to.
         """
         self.source_files = []
-        self.find_code_units(morfs)
+        if hasattr(self, 'find_code_units'):
+            self.find_code_units(morfs)
+        else:
+            self.find_file_reporters(morfs)
 
-        for cu in self.code_units:
+        units = self.code_units if hasattr(self, 'code_units') else self.file_reporters
+        for cu in units:
             try:
                 self.parse_file(cu, self.coverage._analyze(cu))
             except NoSource:
                 if not self.config.ignore_errors:
-                    log.warn('No source for %s', cu.name)
+                    log.warn('No source for %s', cu.filename)
             except NotPython:
                 # Only report errors for .py files, and only if we didn't
                 # explicitly suppress those errors.
                 if cu.should_be_python() and not self.config.ignore_errors:
-                    log.warn('Source file is not python %s', cu.name)
+                    log.warn('Source file is not python %s', cu.filename)
 
         return self.source_files
 
@@ -69,7 +73,10 @@ def parse_file(self, cu, analysis):
                          'Please check if encoding declaration is ok', basename(cu.filename))
                 return
         else:
-            filename = analysis.coverage.file_locator.relative_filename(cu.filename)
+            if hasattr(cu, 'relative_filename'):
+                filename = cu.relative_filename()
+            else:
+                filename = analysis.coverage.file_locator.relative_filename(cu.filename)
             source_lines = list(enumerate(analysis.file_reporter.source_token_lines()))
             source = analysis.file_reporter.source()
         coverage_lines = [self.get_hits(i, analysis) for i in range(1, len(source_lines) + 1)]

tox.ini

@@ -8,6 +8,6 @@ deps =
     sh
     pyyaml: PyYAML>=3.10
     cov3: coverage<4.0a0
-    cov4: coverage>=4.0a4
+    cov4: coverage>=4.0b1
 commands = {posargs:{envpython} setup.py test}