Skip to content

Merge latest master frm upstream - #4

Merged
pombredanne merged 11 commits into
aboutcode-org:masterfrom
pyupio:master
Jan 10, 2020
Merged

pombredanne merged 11 commits into
aboutcode-org:masterfrom
pyupio:master

Conversation

@pombredanne

Copy link
Copy Markdown
Member

No description provided.

pombredanne and others added 11 commits March 14, 2018 20:24
* Ignore local temp directory

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

* Use ordered mapping when loding Pipfile/Pipfile.lock

 * this preserves ordering and fix #19

 * catch ValueError rather than json.JSONDecodeError which is a 
   simplesjon exception and not a json module error

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
* add tests and workaround a toml bug
 * uiri/toml#156

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
pombredanne merged commit 3e40f48 into aboutcode-org:master Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants