Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
heroku-buildpack-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Evili del Rio i Silvan
heroku-buildpack-python
Commits
e2747077
Commit
e2747077
authored
10 years ago
by
Kenneth Reitz
Browse files
Options
Downloads
Patches
Plain Diff
update pip-pop
parent
8ef4a006
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
vendor/pip-pop/pip-diff
+9
-7
9 additions, 7 deletions
vendor/pip-pop/pip-diff
with
9 additions
and
7 deletions
vendor/pip-pop/pip-diff
+
9
−
7
View file @
e2747077
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
"""
Usage:
"""
Usage:
pip-diff (--fresh | --stale) <reqfile1> <reqfile2>
pip-diff (--fresh | --stale) <reqfile1> <reqfile2>
[--exclude <package>...]
pip-diff (-h | --help)
pip-diff (-h | --help)
Options:
Options:
...
@@ -41,7 +41,7 @@ class Requirements(object):
...
@@ -41,7 +41,7 @@ class Requirements(object):
self
.
requirements
.
append
(
requirement
.
req
)
self
.
requirements
.
append
(
requirement
.
req
)
def
diff
(
self
,
requirements
,
ignore_versions
=
False
):
def
diff
(
self
,
requirements
,
ignore_versions
=
False
,
excludes
=
None
):
r1
=
self
r1
=
self
r2
=
requirements
r2
=
requirements
results
=
{
'
fresh
'
:
[],
'
stale
'
:
[]}
results
=
{
'
fresh
'
:
[],
'
stale
'
:
[]}
...
@@ -55,7 +55,7 @@ class Requirements(object):
...
@@ -55,7 +55,7 @@ class Requirements(object):
for
req
in
r2
.
requirements
:
for
req
in
r2
.
requirements
:
r
=
req
.
project_name
if
ignore_versions
else
req
r
=
req
.
project_name
if
ignore_versions
else
req
if
r
not
in
other_reqs
:
if
r
not
in
other_reqs
and
r
not
in
excludes
:
results
[
'
fresh
'
].
append
(
req
)
results
[
'
fresh
'
].
append
(
req
)
# Generate stale packages.
# Generate stale packages.
...
@@ -67,7 +67,7 @@ class Requirements(object):
...
@@ -67,7 +67,7 @@ class Requirements(object):
for
req
in
r1
.
requirements
:
for
req
in
r1
.
requirements
:
r
=
req
.
project_name
if
ignore_versions
else
req
r
=
req
.
project_name
if
ignore_versions
else
req
if
r
not
in
other_reqs
:
if
r
not
in
other_reqs
and
r
not
in
excludes
:
results
[
'
stale
'
].
append
(
req
)
results
[
'
stale
'
].
append
(
req
)
return
results
return
results
...
@@ -76,9 +76,10 @@ class Requirements(object):
...
@@ -76,9 +76,10 @@ class Requirements(object):
def
diff
(
r1
,
r2
,
include_fresh
=
False
,
include_stale
=
False
):
def
diff
(
r1
,
r2
,
include_fresh
=
False
,
include_stale
=
False
,
excludes
=
None
):
include_versions
=
True
if
include_stale
else
False
include_versions
=
True
if
include_stale
else
False
excludes
=
excludes
if
len
(
excludes
)
else
[]
try
:
try
:
r1
=
Requirements
(
r1
)
r1
=
Requirements
(
r1
)
...
@@ -87,7 +88,7 @@ def diff(r1, r2, include_fresh=False, include_stale=False):
...
@@ -87,7 +88,7 @@ def diff(r1, r2, include_fresh=False, include_stale=False):
print
(
'
There was a problem loading the given requirements files.
'
)
print
(
'
There was a problem loading the given requirements files.
'
)
exit
(
os
.
EX_NOINPUT
)
exit
(
os
.
EX_NOINPUT
)
results
=
r1
.
diff
(
r2
,
ignore_versions
=
True
)
results
=
r1
.
diff
(
r2
,
ignore_versions
=
True
,
excludes
=
excludes
)
if
include_fresh
:
if
include_fresh
:
for
line
in
results
[
'
fresh
'
]:
for
line
in
results
[
'
fresh
'
]:
...
@@ -106,7 +107,8 @@ def main():
...
@@ -106,7 +107,8 @@ def main():
'
r1
'
:
args
[
'
<reqfile1>
'
],
'
r1
'
:
args
[
'
<reqfile1>
'
],
'
r2
'
:
args
[
'
<reqfile2>
'
],
'
r2
'
:
args
[
'
<reqfile2>
'
],
'
include_fresh
'
:
args
[
'
--fresh
'
],
'
include_fresh
'
:
args
[
'
--fresh
'
],
'
include_stale
'
:
args
[
'
--stale
'
]
'
include_stale
'
:
args
[
'
--stale
'
],
'
excludes
'
:
args
[
'
<package>
'
]
}
}
diff
(
**
kwargs
)
diff
(
**
kwargs
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment