Skip to content

Commit cdfa62d

Browse files
Officially remove py35 support (facebookresearch#1797)
* Mandate python36 in setup.py. Committing for circle testing. * Remove environment.
1 parent 4ebdb4e commit cdfa62d

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

.circleci/config.yml

-25
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ standard_cpu36: &standard_cpu36
1111
docker:
1212
- image: circleci/python:3.6.5-node
1313

14-
standard_cpu35: &standard_cpu35
15-
docker:
16-
- image: circleci/python:3.5.7
17-
1814
gpu: &gpu
1915
environment:
2016
CUDA_VERSION: "10.0"
@@ -61,12 +57,6 @@ installtorchgpu: &installtorchgpu
6157
pip3 install --progress-bar off pytorch-pretrained-bert
6258
pip3 install --progress-bar off torchtext
6359
64-
installtorchcpu35: &installtorchcpu35
65-
run:
66-
name: Install torch CPU and dependencies
67-
command: |
68-
pip3 install --progress-bar off https://download.pytorch.org/whl/cpu/torch-1.0.1.post2-cp35-cp35m-linux_x86_64.whl
69-
7060
installtorchcpu36: &installtorchcpu36
7161
run:
7262
name: Install torch CPU and dependencies
@@ -116,19 +106,6 @@ jobs:
116106
name: Data tests
117107
command: python setup.py test -s tests.suites.datatests -v
118108

119-
unittests_35:
120-
<<: *standard_cpu35
121-
working_directory: ~/ParlAI
122-
steps:
123-
- checkout
124-
- <<: *fixgit
125-
- <<: *setup
126-
- <<: *installdeps
127-
- <<: *installtorchcpu35
128-
- run:
129-
name: Unit tests (py35)
130-
command: python setup.py test -s tests.suites.unittests -v
131-
132109
unittests_36:
133110
<<: *standard_cpu36
134111
working_directory: ~/ParlAI
@@ -287,7 +264,6 @@ workflows:
287264
- lint
288265
- unittests_37
289266
- unittests_36
290-
- unittests_35
291267
- mturk_tests:
292268
filters:
293269
branches:
@@ -316,7 +292,6 @@ workflows:
316292
only:
317293
- master
318294
jobs:
319-
- unittests_35
320295
- unittests_36
321296
- unittests_37
322297
- mturk_tests

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ python projects/convai2/interactive.py -mf models:convai2/kvmemnn/model
112112

113113
## Requirements
114114

115-
ParlAI currently requires Python3.
115+
ParlAI currently requires Python3.6 or higher.
116116

117117
Dependencies of the core modules are listed in requirement.txt.
118118

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from setuptools import setup, find_packages
99
import sys
1010

11-
if sys.version_info < (3,):
12-
sys.exit('Sorry, Python 3 is required for ParlAI.')
11+
if sys.version_info < (3, 6):
12+
sys.exit('Sorry, Python >=3.6 is required for ParlAI.')
1313

1414
with open('README.md', encoding="utf8") as f:
1515
readme = f.read()
@@ -27,6 +27,7 @@
2727
long_description=readme,
2828
url='http://parl.ai/',
2929
license=license,
30+
python_requires='>=3.6',
3031
packages=find_packages(exclude=(
3132
'data', 'docs', 'downloads', 'examples', 'logs', 'tests')),
3233
install_requires=reqs.strip().split('\n'),

0 commit comments

Comments
 (0)