Skip to content

Commit ff371f1

Browse files
committed
Strip out vendored packages and require them instead. Ref #581.
1 parent 4c2dc87 commit ff371f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+84
-9042
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ env:
1212
- ""
1313
- LC_ALL=C LC_CTYPE=C
1414
script:
15-
- pip install tox
15+
# need tox and rwt to get started
16+
- pip install tox rwt
1617

1718
# Output the env, to verify behavior
1819
- env
1920

2021
# update egg_info based on setup.py in checkout
21-
- python bootstrap.py
22+
- rwt -- bootstrap.py
2223

23-
#- python -m tox
2424
- tox
2525

2626
deploy:

bootstrap.py

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
egg-info command to flesh out the egg-info directory.
66
"""
77

8+
__requires__ = ['packaging', 'six', 'appdirs']
9+
810
import os
911
import sys
1012
import textwrap

pavement.py

-32
This file was deleted.

pkg_resources/__init__.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
# Python 3.2 compatibility
4646
import imp as _imp
4747

48-
from pkg_resources.extern import six
49-
from pkg_resources.extern.six.moves import urllib, map, filter
48+
import six
49+
from six.moves import urllib, map, filter
5050

5151
# capture these to bypass sandboxing
5252
from os import utime
@@ -67,12 +67,11 @@
6767
except ImportError:
6868
importlib_machinery = None
6969

70-
from pkg_resources.extern import appdirs
71-
from pkg_resources.extern import packaging
72-
__import__('pkg_resources.extern.packaging.version')
73-
__import__('pkg_resources.extern.packaging.specifiers')
74-
__import__('pkg_resources.extern.packaging.requirements')
75-
__import__('pkg_resources.extern.packaging.markers')
70+
import packaging.version
71+
import packaging.specifiers
72+
import packaging.requirements
73+
import packaging.markers
74+
import appdirs
7675

7776
if (3, 0) < sys.version_info < (3, 3):
7877
raise RuntimeError("Python 3.3 or later is required")

pkg_resources/_vendor/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)