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
7392f01f
Commit
7392f01f
authored
Apr 26, 2018
by
Hugo
Committed by
Paul Ganssle
May 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop support for EOL Python 3.3
parent
e078d78a
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
20 additions
and
34 deletions
+20
-34
docs/easy_install.txt
docs/easy_install.txt
+1
-1
pkg_resources/__init__.py
pkg_resources/__init__.py
+3
-3
pkg_resources/extern/__init__.py
pkg_resources/extern/__init__.py
+1
-1
pkg_resources/py31compat.py
pkg_resources/py31compat.py
+1
-2
pkg_resources/tests/test_resources.py
pkg_resources/tests/test_resources.py
+3
-3
setup.py
setup.py
+1
-2
setuptools/command/bdist_egg.py
setuptools/command/bdist_egg.py
+1
-1
setuptools/command/build_ext.py
setuptools/command/build_ext.py
+1
-11
setuptools/extern/__init__.py
setuptools/extern/__init__.py
+1
-1
setuptools/monkey.py
setuptools/monkey.py
+0
-2
setuptools/pep425tags.py
setuptools/pep425tags.py
+2
-2
setuptools/site-patch.py
setuptools/site-patch.py
+1
-1
setuptools/tests/test_easy_install.py
setuptools/tests/test_easy_install.py
+1
-1
setuptools/tests/test_egg_info.py
setuptools/tests/test_egg_info.py
+1
-1
setuptools/tests/test_install_scripts.py
setuptools/tests/test_install_scripts.py
+1
-1
tox.ini
tox.ini
+1
-1
No files found.
docs/easy_install.txt
View file @
7392f01f
...
@@ -35,7 +35,7 @@ Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
...
@@ -35,7 +35,7 @@ Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
for download links and basic installation instructions for each of the
for download links and basic installation instructions for each of the
supported platforms.
supported platforms.
You will need at least Python 3.
3
or 2.7. An ``easy_install`` script will be
You will need at least Python 3.
4
or 2.7. An ``easy_install`` script will be
installed in the normal location for Python scripts on your platform.
installed in the normal location for Python scripts on your platform.
Note that the instructions on the setuptools PyPI page assume that you are
Note that the instructions on the setuptools PyPI page assume that you are
...
...
pkg_resources/__init__.py
View file @
7392f01f
...
@@ -78,8 +78,8 @@ __import__('pkg_resources.extern.packaging.requirements')
...
@@ -78,8 +78,8 @@ __import__('pkg_resources.extern.packaging.requirements')
__import__
(
'pkg_resources.extern.packaging.markers'
)
__import__
(
'pkg_resources.extern.packaging.markers'
)
if
(
3
,
0
)
<
sys
.
version_info
<
(
3
,
3
):
if
(
3
,
0
)
<
sys
.
version_info
<
(
3
,
4
):
raise
RuntimeError
(
"Python 3.
3
or later is required"
)
raise
RuntimeError
(
"Python 3.
4
or later is required"
)
if
six
.
PY2
:
if
six
.
PY2
:
# Those builtin exceptions are only defined in Python 3
# Those builtin exceptions are only defined in Python 3
...
@@ -959,7 +959,7 @@ class Environment(object):
...
@@ -959,7 +959,7 @@ class Environment(object):
`platform` is an optional string specifying the name of the platform
`platform` is an optional string specifying the name of the platform
that platform-specific distributions must be compatible with. If
that platform-specific distributions must be compatible with. If
unspecified, it defaults to the current platform. `python` is an
unspecified, it defaults to the current platform. `python` is an
optional string naming the desired version of Python (e.g. ``'3.
3
'``);
optional string naming the desired version of Python (e.g. ``'3.
6
'``);
it defaults to the current version.
it defaults to the current version.
You may explicitly set `platform` (and/or `python`) to ``None`` if you
You may explicitly set `platform` (and/or `python`) to ``None`` if you
...
...
pkg_resources/extern/__init__.py
View file @
7392f01f
...
@@ -48,7 +48,7 @@ class VendorImporter:
...
@@ -48,7 +48,7 @@ class VendorImporter:
# on later Python versions to cause relative imports
# on later Python versions to cause relative imports
# in the vendor package to resolve the same modules
# in the vendor package to resolve the same modules
# as those going through this importer.
# as those going through this importer.
if
sys
.
version_info
>
(
3
,
3
)
:
if
sys
.
version_info
.
major
>=
3
:
del
sys
.
modules
[
extant
]
del
sys
.
modules
[
extant
]
return
mod
return
mod
except
ImportError
:
except
ImportError
:
...
...
pkg_resources/py31compat.py
View file @
7392f01f
...
@@ -15,8 +15,7 @@ def _makedirs_31(path, exist_ok=False):
...
@@ -15,8 +15,7 @@ def _makedirs_31(path, exist_ok=False):
# and exists_ok considerations are disentangled.
# and exists_ok considerations are disentangled.
# See https://github.com/pypa/setuptools/pull/1083#issuecomment-315168663
# See https://github.com/pypa/setuptools/pull/1083#issuecomment-315168663
needs_makedirs
=
(
needs_makedirs
=
(
sys
.
version_info
<
(
3
,
2
,
5
)
or
sys
.
version_info
.
major
==
2
or
(
3
,
3
)
<=
sys
.
version_info
<
(
3
,
3
,
6
)
or
(
3
,
4
)
<=
sys
.
version_info
<
(
3
,
4
,
1
)
(
3
,
4
)
<=
sys
.
version_info
<
(
3
,
4
,
1
)
)
)
makedirs
=
_makedirs_31
if
needs_makedirs
else
os
.
makedirs
makedirs
=
_makedirs_31
if
needs_makedirs
else
os
.
makedirs
pkg_resources/tests/test_resources.py
View file @
7392f01f
...
@@ -668,7 +668,7 @@ class TestParsing:
...
@@ -668,7 +668,7 @@ class TestParsing:
assert
(
assert
(
Requirement
.
parse
(
"name==1.1;python_version=='2.7'"
)
Requirement
.
parse
(
"name==1.1;python_version=='2.7'"
)
!=
!=
Requirement
.
parse
(
"name==1.1;python_version=='3.
3
'"
)
Requirement
.
parse
(
"name==1.1;python_version=='3.
6
'"
)
)
)
assert
(
assert
(
Requirement
.
parse
(
"name==1.0;python_version=='2.7'"
)
Requirement
.
parse
(
"name==1.0;python_version=='2.7'"
)
...
@@ -676,9 +676,9 @@ class TestParsing:
...
@@ -676,9 +676,9 @@ class TestParsing:
Requirement
.
parse
(
"name==1.2;python_version=='2.7'"
)
Requirement
.
parse
(
"name==1.2;python_version=='2.7'"
)
)
)
assert
(
assert
(
Requirement
.
parse
(
"name[foo]==1.0;python_version=='3.
3
'"
)
Requirement
.
parse
(
"name[foo]==1.0;python_version=='3.
6
'"
)
!=
!=
Requirement
.
parse
(
"name[foo,bar]==1.0;python_version=='3.
3
'"
)
Requirement
.
parse
(
"name[foo,bar]==1.0;python_version=='3.
6
'"
)
)
)
def
test_local_version
(
self
):
def
test_local_version
(
self
):
...
...
setup.py
View file @
7392f01f
...
@@ -161,7 +161,6 @@ setup_params = dict(
...
@@ -161,7 +161,6 @@ setup_params = dict(
Programming Language :: Python :: 2
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3
Programming Language :: Python :: 3.3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.6
...
@@ -170,7 +169,7 @@ setup_params = dict(
...
@@ -170,7 +169,7 @@ setup_params = dict(
Topic :: System :: Systems Administration
Topic :: System :: Systems Administration
Topic :: Utilities
Topic :: Utilities
"""
).
strip
().
splitlines
(),
"""
).
strip
().
splitlines
(),
python_requires
=
'>=2.7,!=3.0.*,!=3.1.*,!=3.2.*'
,
python_requires
=
'>=2.7,!=3.0.*,!=3.1.*,!=3.2.*
,!=3.3.*
'
,
extras_require
=
{
extras_require
=
{
"ssl:sys_platform=='win32'"
:
"wincertstore==0.2"
,
"ssl:sys_platform=='win32'"
:
"wincertstore==0.2"
,
"certs"
:
"certifi==2016.9.26"
,
"certs"
:
"certifi==2016.9.26"
,
...
...
setuptools/command/bdist_egg.py
View file @
7392f01f
...
@@ -411,7 +411,7 @@ def scan_module(egg_dir, base, name, stubs):
...
@@ -411,7 +411,7 @@ def scan_module(egg_dir, base, name, stubs):
return True # Extension module
return True # Extension module
pkg = base[len(egg_dir) + 1:].replace(os.sep, '.')
pkg = base[len(egg_dir) + 1:].replace(os.sep, '.')
module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
if sys.version_info
< (3, 3)
:
if sys.version_info
.major == 2
:
skip = 8 # skip magic & date
skip = 8 # skip magic & date
elif sys.version_info < (3, 7):
elif sys.version_info < (3, 7):
skip = 12 # skip magic & date & file size
skip = 12 # skip magic & date & file size
...
...
setuptools/command/build_ext.py
View file @
7392f01f
...
@@ -112,7 +112,7 @@ class build_ext(_build_ext):
...
@@ -112,7 +112,7 @@ class build_ext(_build_ext):
and
get_abi3_suffix
()
and
get_abi3_suffix
()
)
)
if
use_abi3
:
if
use_abi3
:
so_ext
=
_get_config_var_837
(
'EXT_SUFFIX'
)
so_ext
=
get_config_var
(
'EXT_SUFFIX'
)
filename
=
filename
[:
-
len
(
so_ext
)]
filename
=
filename
[:
-
len
(
so_ext
)]
filename
=
filename
+
get_abi3_suffix
()
filename
=
filename
+
get_abi3_suffix
()
if
isinstance
(
ext
,
Library
):
if
isinstance
(
ext
,
Library
):
...
@@ -319,13 +319,3 @@ else:
...
@@ -319,13 +319,3 @@ else:
self
.
create_static_lib
(
self
.
create_static_lib
(
objects
,
basename
,
output_dir
,
debug
,
target_lang
objects
,
basename
,
output_dir
,
debug
,
target_lang
)
)
def
_get_config_var_837
(
name
):
"""
In https://github.com/pypa/setuptools/pull/837, we discovered
Python 3.3.0 exposes the extension suffix under the name 'SO'.
"""
if
sys
.
version_info
<
(
3
,
3
,
1
):
name
=
'SO'
return
get_config_var
(
name
)
setuptools/extern/__init__.py
View file @
7392f01f
...
@@ -48,7 +48,7 @@ class VendorImporter:
...
@@ -48,7 +48,7 @@ class VendorImporter:
# on later Python versions to cause relative imports
# on later Python versions to cause relative imports
# in the vendor package to resolve the same modules
# in the vendor package to resolve the same modules
# as those going through this importer.
# as those going through this importer.
if
sys
.
version_info
>
(
3
,
3
)
:
if
sys
.
version_info
.
major
>=
3
:
del
sys
.
modules
[
extant
]
del
sys
.
modules
[
extant
]
return
mod
return
mod
except
ImportError
:
except
ImportError
:
...
...
setuptools/monkey.py
View file @
7392f01f
...
@@ -75,8 +75,6 @@ def patch_all():
...
@@ -75,8 +75,6 @@ def patch_all():
needs_warehouse
=
(
needs_warehouse
=
(
sys
.
version_info
<
(
2
,
7
,
13
)
sys
.
version_info
<
(
2
,
7
,
13
)
or
or
(
3
,
0
)
<
sys
.
version_info
<
(
3
,
3
,
7
)
or
(
3
,
4
)
<
sys
.
version_info
<
(
3
,
4
,
6
)
(
3
,
4
)
<
sys
.
version_info
<
(
3
,
4
,
6
)
or
or
(
3
,
5
)
<
sys
.
version_info
<=
(
3
,
5
,
3
)
(
3
,
5
)
<
sys
.
version_info
<=
(
3
,
5
,
3
)
...
...
setuptools/pep425tags.py
View file @
7392f01f
...
@@ -97,8 +97,8 @@ def get_abi_tag():
...
@@ -97,8 +97,8 @@ def get_abi_tag():
lambda
:
sys
.
maxunicode
==
0x10ffff
,
lambda
:
sys
.
maxunicode
==
0x10ffff
,
expected
=
4
,
expected
=
4
,
warn
=
(
impl
==
'cp'
and
warn
=
(
impl
==
'cp'
and
sys
.
version_info
<
(
3
,
3
)
))
\
sys
.
version_info
.
major
==
2
))
\
and
sys
.
version_info
<
(
3
,
3
)
:
and
sys
.
version_info
.
major
==
2
:
u
=
'u'
u
=
'u'
abi
=
'%s%s%s%s%s'
%
(
impl
,
get_impl_ver
(),
d
,
m
,
u
)
abi
=
'%s%s%s%s%s'
%
(
impl
,
get_impl_ver
(),
d
,
m
,
u
)
elif
soabi
and
soabi
.
startswith
(
'cpython-'
):
elif
soabi
and
soabi
.
startswith
(
'cpython-'
):
...
...
setuptools/site-patch.py
View file @
7392f01f
...
@@ -23,7 +23,7 @@ def __boot():
...
@@ -23,7 +23,7 @@ def __boot():
break
break
else
:
else
:
try
:
try
:
import
imp
# Avoid import loop in Python
>= 3.
3
import
imp
# Avoid import loop in Python 3
stream
,
path
,
descr
=
imp
.
find_module
(
'site'
,
[
item
])
stream
,
path
,
descr
=
imp
.
find_module
(
'site'
,
[
item
])
except
ImportError
:
except
ImportError
:
continue
continue
...
...
setuptools/tests/test_easy_install.py
View file @
7392f01f
...
@@ -688,7 +688,7 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
...
@@ -688,7 +688,7 @@ def create_setup_requires_package(path, distname='foobar', version='0.1',
)
)
class
TestScriptHeader
:
class
TestScriptHeader
:
non_ascii_exe
=
'/Users/José/bin/python'
non_ascii_exe
=
'/Users/José/bin/python'
exe_with_spaces
=
r'C:\
P
rogram Files\
Py
thon3
3
\
py
thon.exe'
exe_with_spaces
=
r'C:\
P
rogram Files\
Py
thon3
6
\
py
thon.exe'
def
test_get_script_header
(
self
):
def
test_get_script_header
(
self
):
expected
=
'#!%s
\
n
'
%
ei
.
nt_quote_arg
(
os
.
path
.
normpath
(
sys
.
executable
))
expected
=
'#!%s
\
n
'
%
ei
.
nt_quote_arg
(
os
.
path
.
normpath
(
sys
.
executable
))
...
...
setuptools/tests/test_egg_info.py
View file @
7392f01f
...
@@ -452,7 +452,7 @@ class TestEggInfo(object):
...
@@ -452,7 +452,7 @@ class TestEggInfo(object):
def
test_doesnt_provides_extra
(
self
,
tmpdir_cwd
,
env
):
def
test_doesnt_provides_extra
(
self
,
tmpdir_cwd
,
env
):
self
.
_setup_script_with_requires
(
self
.
_setup_script_with_requires
(
'''install_requires=["spam ; python_version<'3.
3
'"]'''
)
'''install_requires=["spam ; python_version<'3.
6
'"]'''
)
environ
=
os
.
environ
.
copy
().
update
(
environ
=
os
.
environ
.
copy
().
update
(
HOME
=
env
.
paths
[
'home'
],
HOME
=
env
.
paths
[
'home'
],
)
)
...
...
setuptools/tests/test_install_scripts.py
View file @
7392f01f
...
@@ -19,7 +19,7 @@ class TestInstallScripts:
...
@@ -19,7 +19,7 @@ class TestInstallScripts:
)
)
unix_exe
=
'/usr/dummy-test-path/local/bin/python'
unix_exe
=
'/usr/dummy-test-path/local/bin/python'
unix_spaces_exe
=
'/usr/bin/env dummy-test-python'
unix_spaces_exe
=
'/usr/bin/env dummy-test-python'
win32_exe
=
'C:
\
\
Dummy Test Path
\
\
Program Files
\
\
Python 3.
3
\
\
python.exe'
win32_exe
=
'C:
\
\
Dummy Test Path
\
\
Program Files
\
\
Python 3.
6
\
\
python.exe'
def
_run_install_scripts
(
self
,
install_dir
,
executable
=
None
):
def
_run_install_scripts
(
self
,
install_dir
,
executable
=
None
):
dist
=
Distribution
(
self
.
settings
)
dist
=
Distribution
(
self
.
settings
)
...
...
tox.ini
View file @
7392f01f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#
#
# To run Tox against all supported Python interpreters, you can set:
# To run Tox against all supported Python interpreters, you can set:
#
#
# export TOXENV='py27,py3{
3,
4,5,6},pypy,pypy3'
# export TOXENV='py27,py3{4,5,6},pypy,pypy3'
[tox]
[tox]
envlist
=
python
envlist
=
python
...
...
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