Skip to content

Commit 9856d70

Browse files
authored
Merge pull request #29 from hackebrot/update-ci-config-add-py37
Update CI config and add Python 3.7
2 parents 6892ee6 + 401c9c4 commit 9856d70

File tree

4 files changed

+55
-88
lines changed

4 files changed

+55
-88
lines changed

.travis.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
1-
# Config file for automatic testing at travis-ci.org
2-
3-
sudo: false
1+
dist: xenial
42
language: python
53

4+
cache:
5+
directories:
6+
- $HOME/.cache/pip
7+
68
matrix:
79
include:
810
- python: 2.7
9-
env: TOX_ENV=py27
11+
env: TOXENV=py27
1012
- python: 3.4
11-
env: TOX_ENV=py34
13+
env: TOXENV=py34
1214
- python: 3.5
13-
env: TOX_ENV=py35
15+
env: TOXENV=py35
1416
- python: 3.6
15-
env: TOX_ENV=py36
17+
env: TOXENV=py36
18+
- python: 3.7
19+
env: TOXENV=py37
1620
- python: pypy
17-
env: TOX_ENV=pypy
18-
- python: 3.6
19-
env: TOX_ENV=flake8
21+
env: TOXENV=pypy
22+
- python: 3.7
23+
env: TOXENV=flake8
2024

2125
install:
2226
- pip install tox
2327

2428
script:
25-
- tox -e $TOX_ENV
26-
27-
before_cache:
28-
- rm -rf $HOME/.cache/pip/log
29-
30-
cache:
31-
directories:
32-
- $HOME/.cache/pip
29+
- tox

appveyor.yml

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,15 @@
1-
# What Python version is installed where:
2-
# http://www.appveyor.com/docs/installed-software#python
3-
41
environment:
52
matrix:
6-
- PYTHON: "C:\\Python27-x64"
7-
TOX_ENV: "py27"
8-
9-
- PYTHON: "C:\\Python34-x64"
10-
TOX_ENV: "py34"
11-
12-
- PYTHON: "C:\\Python35-x64"
13-
TOX_ENV: "py35"
14-
3+
- TOXENV: py27
4+
- TOXENV: py34
5+
- TOXENV: py35
6+
- TOXENV: py36
7+
- TOXENV: py37
158

16-
init:
17-
- "%PYTHON%/python -V"
18-
- "%PYTHON%/python -c \"import struct;print( 8 * struct.calcsize(\'P\'))\""
19-
- "%PYTHON%/python -c \"import sys;print(sys.version_info[0] == 2)\""
20-
- "%PYTHON%/python -c \"import platform;print(platform.system().lower().startswith(\'windows\'))\""
9+
build: off
2110

2211
install:
23-
- "%PYTHON%/Scripts/easy_install -U pip"
24-
- "%PYTHON%/Scripts/pip install tox"
25-
- "%PYTHON%/Scripts/pip install wheel"
26-
27-
build: false # Not a C# project, build stuff at the test step instead.
12+
- pip install tox
2813

2914
test_script:
30-
- "%PYTHON%/Scripts/tox -e %TOX_ENV%"
31-
32-
after_test:
33-
- "%PYTHON%/python setup.py bdist_wheel"
34-
- ps: "ls dist"
35-
36-
artifacts:
37-
- path: dist\*
38-
39-
#on_success:
40-
# - TODO: upload the content of dist/*.whl to a public wheelhouse
15+
- tox

setup.py

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,40 @@
88

99
def read(fname):
1010
file_path = os.path.join(os.path.dirname(__file__), fname)
11-
return codecs.open(file_path, encoding='utf-8').read()
11+
return codecs.open(file_path, encoding="utf-8").read()
1212

1313

1414
setup(
15-
name='pytest-cookies',
16-
version='0.3.0',
17-
author='Raphael Pierzina',
18-
author_email='[email protected]',
19-
maintainer='Raphael Pierzina',
20-
maintainer_email='[email protected]',
21-
license='MIT',
22-
url='https://github.com/hackebrot/pytest-cookies',
23-
description='A Pytest plugin for your Cookiecutter templates',
24-
long_description=read('README.rst'),
25-
py_modules=['pytest_cookies'],
15+
name="pytest-cookies",
16+
version="0.3.0",
17+
author="Raphael Pierzina",
18+
author_email="[email protected]",
19+
maintainer="Raphael Pierzina",
20+
maintainer_email="[email protected]",
21+
license="MIT",
22+
url="https://github.com/hackebrot/pytest-cookies",
23+
description="A Pytest plugin for your Cookiecutter templates",
24+
long_description=read("README.rst"),
25+
py_modules=["pytest_cookies"],
2626
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
27-
install_requires=[
28-
'pytest>=3.3.0',
29-
'cookiecutter>=1.4.0'
30-
],
27+
install_requires=["pytest>=3.3.0", "cookiecutter>=1.4.0"],
3128
classifiers=[
32-
'Development Status :: 4 - Beta',
33-
'Intended Audience :: Developers',
34-
'License :: OSI Approved :: MIT License',
35-
'Operating System :: OS Independent',
36-
'Programming Language :: Python :: 2',
37-
'Programming Language :: Python :: 2.7',
38-
'Programming Language :: Python :: 3',
39-
'Programming Language :: Python :: 3.4',
40-
'Programming Language :: Python :: 3.5',
41-
'Programming Language :: Python :: 3.6',
42-
'Programming Language :: Python :: Implementation :: CPython',
43-
'Programming Language :: Python',
44-
'Topic :: Software Development :: Testing',
45-
'Framework :: Pytest',
29+
"Development Status :: 4 - Beta",
30+
"Intended Audience :: Developers",
31+
"License :: OSI Approved :: MIT License",
32+
"Operating System :: OS Independent",
33+
"Programming Language :: Python :: 2",
34+
"Programming Language :: Python :: 2.7",
35+
"Programming Language :: Python :: 3",
36+
"Programming Language :: Python :: 3.4",
37+
"Programming Language :: Python :: 3.5",
38+
"Programming Language :: Python :: 3.6",
39+
"Programming Language :: Python :: 3.7",
40+
"Programming Language :: Python :: Implementation :: CPython",
41+
"Programming Language :: Python",
42+
"Topic :: Software Development :: Testing",
43+
"Framework :: Pytest",
4644
],
47-
entry_points={
48-
'pytest11': [
49-
'cookies = pytest_cookies',
50-
],
51-
},
52-
keywords=['cookiecutter', 'pytest'],
45+
entry_points={"pytest11": ["cookies = pytest_cookies"]},
46+
keywords=["cookiecutter", "pytest"],
5347
)

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[tox]
2-
envlist = py27,py34,py35,py36,pypy,flake8
2+
envlist = py27,py34,py35,py36,py37,pypy,flake8
33

44
[testenv]
5+
download = true
56
deps = pytest
67
commands = pytest {posargs:tests}
78

0 commit comments

Comments
 (0)