Skip to content

Commit

Permalink
Merge pull request #752 from cssherry/setup_720
Browse files Browse the repository at this point in the history
Closes #720 Fix requires in setup.py
  • Loading branch information
pganssle committed Jun 8, 2018
2 parents d72ef2f + 9f48f0d commit 2831e43
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ switch, and thus all their contributions are dual-licensed.
- Rustem Saiargaliev (gh: @amureki) **D**
- Savraj <savraj@MASKED>
- Sergey Vishnikin <armicron@MASKED>
- Sherry Zhou (gh: @cssherry) **D**
- Stefan Bonchev **D**
- Thierry Bastian <thierryb@MASKED>
- Thomas A Caswell <tcaswell@MASKED> (gh: @tacaswell)
Expand Down
1 change: 1 addition & 0 deletions changelog.d/720.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove deprecated requires from setup.py. Reported by @mhsmith (gh issue #720). Fixed by @cssherry (gh pr #752)
2 changes: 1 addition & 1 deletion dateutil/test/test_import_star.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Test for the "import *" functionality.
As imort * can be only done at module level, it has been added in a separate file
As import * can be only done at module level, it has been added in a separate file
"""
import unittest

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ def README():
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*",
package_data={"dateutil.zoneinfo": ["dateutil-zoneinfo.tar.gz"]},
zip_safe=True,
requires=["six"],
setup_requires=['setuptools_scm'],
install_requires=["six >=1.5"], # XXX fix when packaging is sane again
install_requires=["six >=1.5"],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
Expand Down

0 comments on commit 2831e43

Please sign in to comment.