Skip to content

Commit

Permalink
Add correct test expectations aboutcode-org#1749
Browse files Browse the repository at this point in the history
We now return proper keywords and license.
Also add new rule for Simplified BSD.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
  • Loading branch information
pombredanne authored and viragumathe5 committed Mar 12, 2020
1 parent a4533ff commit f94cb16
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 6 deletions.
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/bsd-simplified_150.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Simplified BSD
3 changes: 3 additions & 0 deletions src/licensedcode/data/rules/bsd-simplified_150.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
license_expression: bsd-simplified
is_license_reference: yes
relevance: 100
86 changes: 80 additions & 6 deletions tests/packagedcode/data/plugin/python-package-expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,15 @@
"description": "===================\npython-atomicwrites\n===================\n\n.. image:: https://travis-ci.org/untitaker/python-atomicwrites.svg?branch=master\n :target: https://travis-ci.org/untitaker/python-atomicwrites\n\n.. image:: https://ci.appveyor.com/api/projects/status/vadc4le3c27to59x/branch/master?svg=true\n :target: https://ci.appveyor.com/project/untitaker/python-atomicwrites/branch/master\n\nAtomic file writes.\n\n.. code-block:: python\n\n from atomicwrites import atomic_write\n\n with atomic_write('foo.txt', overwrite=True) as f:\n f.write('Hello world.')\n # \"foo.txt\" doesn't exist yet.\n\n # Now it does.\n\n\nFeatures that distinguish it from other similar libraries (see `Alternatives and Credit`_):\n\n- Race-free assertion that the target file doesn't yet exist. This can be\n controlled with the ``overwrite`` parameter.\n\n- Windows support, although not well-tested. The MSDN resources are not very\n explicit about which operations are atomic. I'm basing my assumptions off `a\n comment\n <https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/449bb49d-8acc-48dc-a46f-0760ceddbfc3/movefileexmovefilereplaceexisting-ntfs-same-volume-atomic?forum=windowssdk#a239bc26-eaf0-4920-9f21-440bd2be9cc8>`_\n by `Doug Crook\n <https://social.msdn.microsoft.com/Profile/doug%20e.%20cook>`_, who appears\n to be a Microsoft employee:\n\n FAQ: Is MoveFileEx atomic\n Frequently asked question: Is MoveFileEx atomic if the existing and new\n files are both on the same drive?\n\n The simple answer is \"usually, but in some cases it will silently fall-back\n to a non-atomic method, so don't count on it\".\n\n The implementation of MoveFileEx looks something like this: [...]\n\n The problem is if the rename fails, you might end up with a CopyFile, which\n is definitely not atomic.\n\n If you really need atomic-or-nothing, you can try calling\n NtSetInformationFile, which is unsupported but is much more likely to be\n atomic. \n\n- Simple high-level API that wraps a very flexible class-based API.\n\n- Consistent error handling across platforms.\n\n\nHow it works\n============\n\nIt uses a temporary file in the same directory as the given path. This ensures\nthat the temporary file resides on the same filesystem.\n\nThe temporary file will then be atomically moved to the target location: On\nPOSIX, it will use ``rename`` if files should be overwritten, otherwise a\ncombination of ``link`` and ``unlink``. On Windows, it uses MoveFileEx_ through\nstdlib's ``ctypes`` with the appropriate flags.\n\nNote that with ``link`` and ``unlink``, there's a timewindow where the file\nmight be available under two entries in the filesystem: The name of the\ntemporary file, and the name of the target file.\n\nAlso note that the permissions of the target file may change this way. In some\nsituations a ``chmod`` can be issued without any concurrency problems, but\nsince that is not always the case, this library doesn't do it by itself.\n\n.. _MoveFileEx: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365240%28v=vs.85%29.aspx\n\nfsync\n-----\n\nOn POSIX, ``fsync`` is invoked on the temporary file after it is written (to\nflush file content and metadata), and on the parent directory after the file is\nmoved (to flush filename).\n\n``fsync`` does not take care of disks' internal buffers, but there don't seem\nto be any standard POSIX APIs for that. On OS X, ``fcntl`` is used with\n``F_FULLFSYNC`` instead of ``fsync`` for that reason.\n\nOn Windows, `_commit <https://msdn.microsoft.com/en-us/library/17618685.aspx>`_\nis used, but there are no guarantees about disk internal buffers.\n\nAlternatives and Credit\n=======================\n\nAtomicwrites is directly inspired by the following libraries (and shares a\nminimal amount of code):\n\n- The Trac project's `utility functions\n <http://www.edgewall.org/docs/tags-trac-0.11.7/epydoc/trac.util-pysrc.html>`_,\n also used in `Werkzeug <http://werkzeug.pocoo.org/>`_ and\n `mitsuhiko/python-atomicfile\n <https://github.com/mitsuhiko/python-atomicfile>`_. The idea to use\n ``ctypes`` instead of ``PyWin32`` originated there.\n\n- `abarnert/fatomic <https://github.com/abarnert/fatomic>`_. Windows support\n (based on ``PyWin32``) was originally taken from there.\n\nOther alternatives to atomicwrites include:\n\n- `sashka/atomicfile <https://github.com/sashka/atomicfile>`_. Originally I\n considered using that, but at the time it was lacking a lot of features I\n needed (Windows support, overwrite-parameter, overriding behavior through\n subclassing).\n\n- The `Boltons library collection <https://github.com/mahmoud/boltons>`_\n features a class for atomic file writes, which seems to have a very similar\n ``overwrite`` parameter. It is lacking Windows support though.\n\nLicense\n=======\n\nLicensed under the MIT, see ``LICENSE``.\n\n\n",
"release_date": null,
"parties": [],
"keywords": [],
"keywords": [
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: Implementation :: CPython"
],
"homepage_url": "https://github.com/untitaker/python-atomicwrites",
"download_url": null,
"size": null,
Expand All @@ -65,7 +73,10 @@
"copyright": null,
"license_expression": "mit",
"declared_license": {
"license": "MIT"
"license": "MIT",
"classifiers": [
"License :: OSI Approved :: MIT License"
]
},
"notice_text": null,
"manifest_path": null,
Expand All @@ -83,7 +94,62 @@
{
"path": "metadata.json",
"type": "file",
"packages": [],
"packages": [
{
"type": "pypi",
"namespace": null,
"name": "six",
"version": "1.10.0",
"qualifiers": null,
"subpath": null,
"primary_language": "Python",
"description": "Python 2 and 3 compatibility utilities",
"release_date": null,
"parties": [
{
"type": "person",
"role": "contact",
"name": "Benjamin Peterson",
"email": null,
"url": null
}
],
"keywords": [
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 3",
"Intended Audience :: Developers",
"Topic :: Software Development :: Libraries",
"Topic :: Utilities"
],
"homepage_url": "http://pypi.python.org/pypi/six/",
"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": "mit",
"declared_license": {
"license": "MIT",
"classifiers": [
"License :: OSI Approved :: MIT License"
]
},
"notice_text": null,
"manifest_path": null,
"dependencies": [],
"contains_source_code": null,
"source_packages": [],
"purl": "pkg:pypi/six@1.10.0",
"repository_homepage_url": null,
"repository_download_url": null,
"api_data_url": null
}
],
"scan_errors": []
},
{
Expand All @@ -100,7 +166,15 @@
"primary_language": "Python",
"description": "Library for accessing \"ar\" files",
"release_date": null,
"parties": [],
"parties": [
{
"type": "person",
"role": "author",
"name": "Stanis\u0142aw Pitucha",
"email": "viraptor@gmail.com",
"url": null
}
],
"keywords": [],
"homepage_url": "http://bitbucket.org/viraptor/arpy",
"download_url": null,
Expand All @@ -113,9 +187,9 @@
"code_view_url": null,
"vcs_url": null,
"copyright": null,
"license_expression": null,
"license_expression": "bsd-simplified",
"declared_license": {
"license": null,
"license": "Simplified BSD",
"classifiers": []
},
"notice_text": null,
Expand Down

0 comments on commit f94cb16

Please sign in to comment.