Skip to content

Commit 6e0975f

Browse files
pipermerriampipermerriam
authored
Merge pull request #54 from pipermerriam/piper/drop-python2-support
drop support for python 2.7, add 3.6 support
2 parents 4b528dd + f23621f commit 6e0975f

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

‎.travis.yml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,152 +14,152 @@ matrix:
1414
- python: "3.5"
1515
env: TOX_POSARGS="-e flake8"
1616
# installation
17-
- python: "2.7"
18-
env: TOX_POSARGS="-e py27-installation"
1917
- python: "3.4"
2018
env: TOX_POSARGS="-e py34-installation"
2119
- python: "3.5"
2220
env: TOX_POSARGS="-e py35-installation"
21+
- python: "3.6"
22+
env: TOX_POSARGS="-e py36-installation"
2323
# solc 0.4.1
24-
- python: "2.7"
25-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.1
2624
- python: "3.4"
2725
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.1
2826
- python: "3.5"
2927
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.1
28+
- python: "3.6"
29+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.1
3030
# solc 0.4.2
31-
- python: "2.7"
32-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.2
3331
- python: "3.4"
3432
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.2
3533
- python: "3.5"
3634
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.2
35+
- python: "3.6"
36+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.2
3737
# solc 0.4.6
38-
- python: "2.7"
39-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.6
4038
- python: "3.4"
4139
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.6
4240
- python: "3.5"
4341
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.6
42+
- python: "3.6"
43+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.6
4444
# solc 0.4.7
45-
- python: "2.7"
46-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.7
4745
- python: "3.4"
4846
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.7
4947
- python: "3.5"
5048
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.7
49+
- python: "3.6"
50+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.7
5151
# solc 0.4.8
52-
- python: "2.7"
53-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.8
5452
- python: "3.4"
5553
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.8
5654
- python: "3.5"
5755
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.8
56+
- python: "3.6"
57+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.8
5858
# solc 0.4.9
59-
- python: "2.7"
60-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.9
6159
- python: "3.4"
6260
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.9
6361
- python: "3.5"
6462
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.9
63+
- python: "3.6"
64+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.9
6565
# solc 0.4.11
66-
- python: "2.7"
67-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.11
6866
- python: "3.4"
6967
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.11
7068
- python: "3.5"
7169
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.11
70+
- python: "3.6"
71+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.11
7272
# solc 0.4.12
73-
- python: "2.7"
74-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.12
7573
- python: "3.4"
7674
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.12
7775
- python: "3.5"
7876
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.12
77+
- python: "3.6"
78+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.12
7979
# solc 0.4.13
80-
- python: "2.7"
81-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.13
8280
- python: "3.4"
8381
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.13
8482
- python: "3.5"
8583
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.13
84+
- python: "3.6"
85+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.13
8686
# solc 0.4.14
87-
- python: "2.7"
88-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.14
8987
- python: "3.4"
9088
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.14
9189
- python: "3.5"
9290
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.14
91+
- python: "3.6"
92+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.14
9393
# solc 0.4.15
94-
- python: "2.7"
95-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.15
9694
- python: "3.4"
9795
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.15
9896
- python: "3.5"
9997
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.15
98+
- python: "3.6"
99+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.15
100100
# solc 0.4.16
101-
- python: "2.7"
102-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.16
103101
- python: "3.4"
104102
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.16
105103
- python: "3.5"
106104
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.16
105+
- python: "3.6"
106+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.16
107107
# solc 0.4.17
108-
- python: "2.7"
109-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.17
110108
- python: "3.4"
111109
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.17
112110
- python: "3.5"
113111
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.17
112+
- python: "3.6"
113+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.17
114114
# solc 0.4.18
115-
- python: "2.7"
116-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.18
117115
- python: "3.4"
118116
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.18
119117
- python: "3.5"
120118
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.18
119+
- python: "3.6"
120+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.18
121121
# solc 0.4.19
122-
- python: "2.7"
123-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.19
124122
- python: "3.4"
125123
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.19
126124
- python: "3.5"
127125
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.19
126+
- python: "3.6"
127+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.19
128128
# solc 0.4.20
129-
- python: "2.7"
130-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.20
131129
- python: "3.4"
132130
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.20
133131
- python: "3.5"
134132
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.20
133+
- python: "3.6"
134+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.20
135135
# solc 0.4.21
136-
- python: "2.7"
137-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.21
138136
- python: "3.4"
139137
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.21
140138
- python: "3.5"
141139
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.21
140+
- python: "3.6"
141+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.21
142142
# solc 0.4.22
143-
- python: "2.7"
144-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.22
145143
- python: "3.4"
146144
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.22
147145
- python: "3.5"
148146
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.22
147+
- python: "3.6"
148+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.22
149149
# solc 0.4.23
150-
- python: "2.7"
151-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.23
152150
- python: "3.4"
153151
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.23
154152
- python: "3.5"
155153
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.23
154+
- python: "3.6"
155+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.23
156156
# solc 0.4.24
157-
- python: "2.7"
158-
env: TOX_POSARGS="-e py27" SOLC_VERSION=v0.4.24
159157
- python: "3.4"
160158
env: TOX_POSARGS="-e py34" SOLC_VERSION=v0.4.24
161159
- python: "3.5"
162160
env: TOX_POSARGS="-e py35" SOLC_VERSION=v0.4.24
161+
- python: "3.6"
162+
env: TOX_POSARGS="-e py36" SOLC_VERSION=v0.4.24
163163
cache:
164164
- pip: true
165165
before_install:

‎setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
include_package_data=True,
1919
py_modules=['solc'],
2020
setup_requires=['setuptools-markdown'],
21+
python_requires='>=3.4, <4',
2122
install_requires=[
2223
"semantic_version>=2.6.0",
2324
],

‎tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist=
3-
py{27,34,35}-{core,installation}
3+
py{34,35,36}-{core,installation}
44
flake8
55

66
[flake8]
@@ -14,14 +14,15 @@ commands=
1414
passenv =
1515
SOLC_BINARY
1616
TRAVIS_BUILD_DIR
17+
SOLC_RUN_INSTALL_TESTS
1718
setenv =
18-
py{27,34,35}-installation: SOLC_RUN_INSTALL_TESTS=enabled
19+
py{34,35,36}-installation: SOLC_RUN_INSTALL_TESTS=enabled
1920
deps =
2021
-r{toxinidir}/requirements-dev.txt
2122
basepython =
22-
py27: python2.7
2323
py34: python3.4
2424
py35: python3.5
25+
py36: python3.6
2526

2627
[testenv:flake8]
2728
basepython=python

0 commit comments

Comments
 (0)