Merge branch 'Siddhant-K-code:siddhant-improving-pypi'

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: Siddhant-K-code

tests/packagedcode/data/pypi/setup.py/with_name-expected.json

@@ -0,0 +1,46 @@
+{
+  "type": "pypi",
+  "namespace": null,
+  "name": "arpy",
+  "version": "0.1.1",
+  "qualifiers": {},
+  "subpath": null,
+  "primary_language": "Python",
+  "description": "Library for accessing \"ar\" files",
+  "release_date": null,
+  "parties": [
+    {
+      "type": "person",
+      "role": "author",
+      "name": "Stanis\u0142aw Pitucha",
+      "email": "[email protected]",
+      "url": "http://bitbucket.org/viraptor/arpy"
+    }
+  ],
+  "keywords": [],
+  "homepage_url": "http://bitbucket.org/viraptor/arpy",
+  "download_url": null,
+  "size": null,
+  "sha1": null,
+  "md5": null,
+  "sha256": null,
+  "sha512": null,
+  "bug_tracking_url": null,
+  "code_view_url": null,
+  "vcs_url": null,
+  "copyright": null,
+  "license_expression": "bsd-simplified",
+  "declared_license": {
+    "license": "Simplified BSD",
+    "classifiers": []
+  },
+  "notice_text": null,
+  "root_path": null,
+  "dependencies": [],
+  "contains_source_code": null,
+  "source_packages": [],
+  "purl": "pkg:pypi/[email protected]",
+  "repository_homepage_url": "https://pypi.org/project/arpy",
+  "repository_download_url": "https://pypi.io/packages/source/a/arpy/arpy-0.1.1.tar.gz",
+  "api_data_url": "http://pypi.python.org/pypi/arpy/0.1.1/json"
+}

tests/packagedcode/data/pypi/setup.py/with_name.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from distutils.core import setup
+
+setup(name='arpy',
+		version='0.1.1',
+		description='Library for accessing "ar" files',
+		author=u'Stanisław Pitucha',
+		author_email='[email protected]',
+		url='http://bitbucket.org/viraptor/arpy',
+		py_modules=['arpy'],
+		license="Simplified BSD",
+		)
+

tests/packagedcode/data/pypi/setup.py/without_name.py

@@ -0,0 +1,8 @@
+from setuptools import setup
+
+setup(
+    version="1.0.0",
+    description="A sample package",
+    author="Test",
+    author_email="[email protected]",
+    package_requires=[])

tests/packagedcode/test_pypi.py

@@ -172,6 +172,19 @@ def test_parse_metadata_unpacked_sdist_metadata_v10_subdir(self):
         expected_loc = self.get_test_loc('pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-subdir-expected.json')
         self.check_package(package, expected_loc, regen=False)
 
+    def test_parse_setup_py_with_name(self):
+        test_file = self.get_test_loc('pypi/setup.py/with_name.py')
+        packages = pypi.parse_setup_py(test_file)
+        expected_loc = self.get_test_loc('pypi/setup.py/with_name.py.expected')
+        self.check_packages(packages, expected_loc, regen=False)
+
+    def test_parse_setup_py_without_name(self):
+        test_file = self.get_test_loc('pypi/setup.py/without_name.py')
+        try:
+            pypi.parse_setup_py(test_file)
+        except AttributeError as e:
+            assert "'NoneType' object has no attribute 'to_dict'" in str(e)
+
     def test_parse_metadata_unpacked_sdist_metadata_v11_1(self):
         test_file = self.get_test_loc('pypi/unpacked_sdist/metadata-1.1/python-mimeparse-1.6.0/PKG-INFO')
         package = pypi.parse_metadata(test_file)