Skip to content

Commit

Permalink
removed python 2.7 and 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
FedericoTartarini committed Feb 17, 2020
1 parent 588d2b9 commit a6befb7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 32 deletions.
16 changes: 0 additions & 16 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,6 @@ environment:
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '32'
- TOXENV: py27,codecov
TOXPYTHON: C:\Python27\python.exe
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '32'
- TOXENV: py27,codecov
TOXPYTHON: C:\Python27-x64\python.exe
PYTHON_HOME: C:\Python27-x64
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '64'
WINDOWS_SDK_VERSION: v7.0
- TOXENV: py35,codecov
TOXPYTHON: C:\Python35\python.exe
PYTHON_HOME: C:\Python35
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '32'
- TOXENV: py35,codecov
TOXPYTHON: C:\Python35-x64\python.exe
PYTHON_HOME: C:\Python35-x64
Expand Down
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,12 @@ env:
- SEGFAULT_SIGNALS=all
matrix:
include:
- python: '3.6'
- python: '3.7'
env:
- TOXENV=check
- python: '3.6'
- python: '3.7'
env:
- TOXENV=docs
- env:
- TOXENV=py27,codecov
python: '2.7'
- env:
- TOXENV=py35,codecov
python: '3.5'
- env:
- TOXENV=py36,codecov
python: '3.6'
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ def read(*names, **kwargs):
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
Expand All @@ -71,7 +69,7 @@ def read(*names, **kwargs):
keywords=[
# eg: 'keyword1', 'keyword2', 'keyword3',
],
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
python_requires='>=3.6.*',
install_requires=[
# eg: 'aspectlib==1.1.1', 'six>=1.7',
],
Expand Down
4 changes: 2 additions & 2 deletions src/pythermalcomfort/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,8 @@ def set_tmp(ta, tr, v, rh, met, clo, wme=0, body_surface_area=1.8258, p_atm=1013
if met < 0.85:
CHCS = 3.0
else:
CHCS = 5.66 * pow(((met - 0.85)), 0.39)
if (CHCS < 3.0):
CHCS = 5.66 * math.pow((met - 0.85), 0.39)
if CHCS < 3.0:
CHCS = 3.0
CTCS = CHCS + CHRS
RCLOS = 1.52 / ((met - wme / met_factor) + 0.6944) - 0.1835
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@ envlist =
clean,
check,
docs,
{py27,py35,py36,py37,py38,pypy,pypy3},
{py36,py37,py38,pypy,pypy3},
report
ignore_basepython_conflict = true

[testenv]
basepython =
pypy: {env:TOXPYTHON:pypy}
pypy3: {env:TOXPYTHON:pypy3}
py27: {env:TOXPYTHON:python2.7}
py35: {env:TOXPYTHON:python3.5}
py36: {env:TOXPYTHON:python3.6}
{py37,docs}: {env:TOXPYTHON:python3.7}
py38: {env:TOXPYTHON:python3.8}
Expand Down

0 comments on commit a6befb7

Please sign in to comment.