Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
python-defaults
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pkg
python-defaults
Commits
1b6e103a
Commit
1b6e103a
authored
13 years ago
by
Piotr Ożarowski
Browse files
Options
Downloads
Patches
Plain Diff
remove setuptools from requires.txt
(it is replaced with python-pkg-resources Debian dependency)
parent
28d4141e
No related branches found
Branches containing commit
Tags
debian/2.6.6-13
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+2
-0
2 additions, 0 deletions
debian/changelog
debpython/pydist.py
+25
-8
25 additions, 8 deletions
debpython/pydist.py
with
27 additions
and
8 deletions
debian/changelog
+
2
−
0
View file @
1b6e103a
...
...
@@ -27,6 +27,8 @@ python-defaults (2.7.2-2) UNRELEASED; urgency=low
- /usr/share/pyshared is not added to the package if empty (closes: 623909)
- dh_python2's manpage updated (among other changes, no longer advertises
python:Breaks - closes: 631397, describes .pyinstall and .pyremove files)
- remove setuptools from requires.txt (it is replaced with
python-pkg-resources Debian dependency)
-- Piotr Ożarowski <piotr@debian.org> Sun, 12 Jun 2011 13:28:48 +0200
...
...
This diff is collapsed.
Click to expand it.
debpython/pydist.py
+
25
−
8
View file @
1b6e103a
...
...
@@ -186,16 +186,33 @@ def parse_pydep(fname):
ver
=
None
result
=
[]
modified
=
optional_section
=
False
processed
=
[]
with
open
(
fname
,
'
r
'
)
as
fp
:
for
line
in
fp
:
line
=
line
.
strip
()
# ignore all optional sections
lines
=
[
i
.
strip
()
for
i
in
fp
.
readlines
()]
for
line
in
lines
:
if
not
line
or
line
.
startswith
(
'
#
'
):
processed
.
append
(
line
)
continue
if
line
.
startswith
(
'
[
'
):
break
if
line
:
dependency
=
guess_dependency
(
line
,
ver
)
if
dependency
:
result
.
append
(
dependency
)
optional_section
=
True
if
optional_section
:
processed
.
append
(
line
)
continue
dependency
=
guess_dependency
(
line
,
ver
)
if
dependency
:
result
.
append
(
dependency
)
if
'
setuptools
'
in
line
.
lower
():
# TODO: or dependency in recommends\
# or dependency in suggests
modified
=
True
else
:
processed
.
append
(
line
)
else
:
processed
.
append
(
line
)
if
modified
:
with
open
(
fname
,
'
w
'
)
as
fp
:
fp
.
writelines
(
i
+
'
\n
'
for
i
in
processed
)
return
result
...
...
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