Skip to content

MNT: Drop Python 2 support #2654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 42 commits into from
Nov 13, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1108430
CI: Drop Python 2 tests
effigies Jul 25, 2018
4a84a02
RF: Remove builtins
effigies Jul 25, 2018
9e47ec0
RF: Drop one-line __future__ imports
effigies Jul 25, 2018
06ecbe4
RF: Remove two-line __future__ imports
effigies Jul 25, 2018
b90f7d5
MAINT: Update version, supported Python versions
effigies Jul 25, 2018
b5ef915
FIX: Dangling import
effigies Jul 25, 2018
e968b8d
RF: Drop imports in checkspecs
effigies Jul 25, 2018
7a0e638
MAINT: make specs
effigies Jul 25, 2018
fa347ae
CI: Drop 2.7, add 3.7-dev on Travis
effigies Jul 25, 2018
f25cfc0
RF: Purge PY2/PY3 indicators
effigies Jul 25, 2018
323663f
RF: Purge "from io import open"
effigies Jul 25, 2018
e2dc9f8
DOC: Suggest raise from syntax
effigies Jul 25, 2018
9517c5a
TEST: Drop legacy auto tests
effigies Jul 26, 2018
f4f7865
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Jul 30, 2018
421600b
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Aug 13, 2018
1e5344e
CI: Build Python 3 wheels only
effigies Aug 13, 2018
055a59f
FIX: Run decode on bytes, not tuple
effigies Aug 13, 2018
938cdf4
CI: Do not install future, remove futures check
effigies Aug 13, 2018
f31416a
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Aug 30, 2018
e990c69
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Sep 24, 2018
2cfcd5a
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Oct 11, 2018
dbfaf7e
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Nov 14, 2018
9880669
Merge branch 'master' into dev/2.0
effigies Dec 17, 2018
83e4dc9
PY3: Drop future/builtins imports
effigies Dec 17, 2018
e057971
MAINT: Minimum python version > 3.2
effigies Dec 17, 2018
b0d464c
RF: Drop various remaining compatibilities for Python < 3.5
effigies Dec 17, 2018
be2d8c5
RF: Drop to_str, makedirs compatibility functions
effigies Dec 17, 2018
5ab2fa0
FIX: import os - mistakenly dropped
effigies Dec 17, 2018
dc89681
FIX: os.makedirs does not return directory
effigies Dec 17, 2018
80ed64d
Merge pull request #2831 from effigies/dev/2/min_version
effigies Jan 1, 2019
f112c58
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Jan 28, 2019
d997694
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Feb 25, 2019
375d00f
Merge branch 'master' into dev/2.0
effigies May 9, 2019
08cd3d3
MAINT: Sort dependencies
effigies Aug 21, 2019
f464954
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Aug 21, 2019
7baa6d3
PY3: Remove PY2 str hack
effigies Aug 21, 2019
797841b
Merge branch 'master' into dev/2.0
effigies Oct 8, 2019
72ac8a5
MNT: Missed Py2 cleanups
effigies Oct 8, 2019
7b9c639
MNT: Drop Py2 compatibility for tools/
effigies Oct 8, 2019
497b44d
STY: Black files pre-merge
effigies Nov 12, 2019
49cc0a7
Merge remote-tracking branch 'upstream/master' into dev/2.0
effigies Nov 12, 2019
39fbd54
FIX: Missed merge issue
effigies Nov 12, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CI: Build Python 3 wheels only
  • Loading branch information
effigies committed Aug 13, 2018
commit 1e5344ef29211d2fcc63a968d69ae48fb8f2ae93
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,15 @@ jobs:
- run:
name: Check pypi preconditions
command: |
pyenv local 3.5.2
pip install --upgrade twine future wheel readme_renderer setuptools
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we remove future?

python setup.py check -r -s
python setup.py sdist bdist_wheel
- run:
name: Validate Python 3 installation
command: |
pyenv local 3.5.2
pip install dist/nipype-*-py2.py3-none-any.whl
pip install dist/nipype-*-py3-none-any.whl
# Futures should not install in Python 3
test $(pip show futures 2>/dev/null | wc -l) = "0"
- store_artifacts:
Expand All @@ -338,6 +339,7 @@ jobs:
- run:
name: Deploy to PyPI
command: |
pyenv local 3.5.2
pip install --upgrade twine future wheel readme_renderer setuptools
python setup.py check -r -s
python setup.py sdist bdist_wheel
Expand Down Expand Up @@ -382,7 +384,7 @@ workflows:
- pypi_precheck:
filters:
branches:
only: /rel\/.*/
only: /(rel|dev)\/.*/
tags:
only: /.*/
- compare_base_dockerfiles:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[bdist_wheel]
universal=1
python-tag=py3