Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
3b830754
Commit
3b830754
authored
Dec 24, 2018
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rely on package names to namespace the package contents.
parent
235dc9d7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
setuptools/wheel.py
setuptools/wheel.py
+7
-6
No files found.
setuptools/wheel.py
View file @
3b830754
...
...
@@ -8,10 +8,11 @@ import posixpath
import
re
import
zipfile
from
pkg_resources
import
Distribution
,
PathMetadata
,
parse_version
import
pkg_resources
import
setuptools
from
pkg_resources
import
parse_version
from
setuptools.extern.packaging.utils
import
canonicalize_name
from
setuptools.extern.six
import
PY3
from
setuptools
import
Distribution
as
SetuptoolsDistribution
from
setuptools
import
pep425tags
from
setuptools.command.egg_info
import
write_requirements
...
...
@@ -79,7 +80,7 @@ class Wheel:
return next((True for t in self.tags() if t in supported_tags), False)
def egg_name(self):
return Distribution(
return
pkg_resources.
Distribution(
project_name=self.project_name, version=self.version,
platform=(None if self.platform == 'any' else get_platform()),
).egg_name() + '.egg'
...
...
@@ -130,9 +131,9 @@ class Wheel:
zf.extractall(destination_eggdir)
# Convert metadata.
dist_info = os.path.join(destination_eggdir, dist_info)
dist = Distribution.from_location(
dist =
pkg_resources.
Distribution.from_location(
destination_eggdir, dist_info,
metadata=PathMetadata(destination_eggdir, dist_info),
metadata=
pkg_resources.
PathMetadata(destination_eggdir, dist_info),
)
# Note: Evaluate and strip markers now,
...
...
@@ -155,7 +156,7 @@ class Wheel:
os.path.join(egg_info, 'METADATA'),
os.path.join(egg_info, 'PKG-INFO'),
)
setup_dist =
Setuptools
Distribution(
setup_dist =
setuptools.
Distribution(
attrs=dict(
install_requires=install_requires,
extras_require=extras_require,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment