Skip to content

Commit 7ab165b

Browse files
authored
Merge pull request #10 from juhasch/update
Bump versions
2 parents d262fe7 + 77dabb7 commit 7ab165b

File tree

4 files changed

+30
-54
lines changed

4 files changed

+30
-54
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.3.3
2+
current_version = 0.4.0
33
commit = True
44
message = release {new_version}
55
tag = False

appveyor.yml

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,21 @@ cache:
88
- '%LOCALAPPDATA%\pip\Cache'
99
environment:
1010
matrix:
11-
- TOXENV: 'py27-notebook'
12-
TOXPYTHON: C:\Python27\python.exe
13-
PYTHON_HOME: C:\Python27
14-
PYTHON_VERSION: '2.7'
15-
PYTHON_ARCH: '32'
16-
- TOXENV: 'py33-notebook'
17-
TOXPYTHON: C:\Python33\python.exe
18-
PYTHON_HOME: C:\Python33
19-
PYTHON_VERSION: '3.3'
20-
PYTHON_ARCH: '32'
21-
- TOXENV: 'py34-notebook40'
22-
TOXPYTHON: C:\Python34\python.exe
23-
PYTHON_HOME: C:\Python34
24-
PYTHON_VERSION: '3.4'
25-
PYTHON_ARCH: '32'
26-
- TOXENV: 'py34-notebook41'
27-
TOXPYTHON: C:\Python34\python.exe
28-
PYTHON_HOME: C:\Python34
29-
PYTHON_VERSION: '3.4'
30-
PYTHON_ARCH: '32'
31-
- TOXENV: 'py34-notebook4x'
32-
TOXPYTHON: C:\Python34\python.exe
33-
PYTHON_HOME: C:\Python34
34-
PYTHON_VERSION: '3.4'
35-
PYTHON_ARCH: '32'
36-
- TOXENV: 'py35-notebook'
37-
TOXPYTHON: C:\Python35\python.exe
38-
PYTHON_HOME: C:\Python35
39-
PYTHON_VERSION: '3.5'
40-
PYTHON_ARCH: '32'
11+
- TOXENV: 'py36-notebook57'
12+
TOXPYTHON: C:\Python36-x64\python.exe
13+
PYTHON_HOME: C:\Python36-x64
14+
PYTHON_VERSION: '3.6'
15+
PYTHON_ARCH: '64'
16+
- TOXENV: 'py36-notebook64'
17+
TOXPYTHON: C:\Python36-x64\python.exe
18+
PYTHON_HOME: C:\Python36-x64
19+
PYTHON_VERSION: '3.6'
20+
PYTHON_ARCH: '64'
21+
- TOXENV: 'py36-notebook'
22+
TOXPYTHON: C:\Python36-x64\python.exe
23+
PYTHON_HOME: C:\Python36-x64
24+
PYTHON_VERSION: '3.6'
25+
PYTHON_ARCH: '64'
4126
init:
4227
- ps: echo $env:TOXENV
4328
- ps: ls C:\Python*
@@ -51,9 +36,9 @@ install:
5136
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
5237
# Upgrade to the latest version of pip to avoid it displaying warnings
5338
# about it being out of date.
54-
- 'pip install --disable-pip-version-check --user --upgrade pip'
39+
- 'python -m pip install --disable-pip-version-check --user --upgrade pip'
5540
# install tox
56-
- pip install tox
41+
- python -m pip install tox
5742
# install of the actual project is handled by tox in tests
5843
test_script:
5944
# run tox tests

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ def main():
2323
- common application components and cli scripts
2424
- utility classes and functions for use in tests
2525
""",
26-
version='0.3.3',
26+
version='0.4.0',
2727
author='jcb91, jupyter-contrib developers',
2828
author_email='[email protected]',
2929
url=('https://github.com/'
3030
'jupyter-contrib/jupyter_contrib_core'),
3131
download_url=('https://github.com/'
3232
'jupyter-contrib/jupyter_contrib_core/'
33-
'tarball/0.3.3'),
33+
'tarball/0.4.0'),
3434
keywords=['Jupyter', 'notebook'],
3535
license='BSD 3-clause',
3636
platforms=['any'],

tox.ini

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ envlist =
66
clean,
77
check,
88
lint,
9-
{py27,py34}-notebook{40,41,42,4x},
9+
py36-notebook{57,64},
1010
report,
1111

1212
[testenv]
1313
basepython =
1414
pypy: {env:TOXPYTHON:pypy}
15-
py27: {env:TOXPYTHON:python2.7}
16-
py33: {env:TOXPYTHON:python3.3}
17-
py34: {env:TOXPYTHON:python3.4}
18-
py35: {env:TOXPYTHON:python3.5}
1915
py36: {env:TOXPYTHON:python3.6}
20-
{docs,spell}: {env:TOXPYTHON:python2.7}
21-
{appveyorartifacts,bump,check,clean,codecov,coveralls,lint,report,pypi_build,pypi_upload}: {env:TOXPYTHON:python3}
22-
{condarecipe}: {env:TOXPYTHON:python3.4}
16+
{docs,spell}: {env:TOXPYTHON:python3.6}
17+
{appveyorartifacts,bump,check,clean,codecov,coveralls,lint,report,pypi_build,pypi_upload}: {env:TOXPYTHON:python3.6}
18+
{condarecipe}: {env:TOXPYTHON:python3.6}
2319
setenv =
2420
PYTHONPATH={toxinidir}/tests
2521
PYTHONUNBUFFERED=yes
@@ -29,13 +25,8 @@ deps =
2925
coverage>=4.2
3026
mock
3127
nose
32-
notebook40: notebook>=4.0,<4.1
33-
notebook41: notebook>=4.1,<4.2
34-
notebook42: notebook>=4.2,<4.3
35-
notebook43: notebook>=4.3,<4.4
36-
notebook44: notebook>=4.4,<4.5
37-
notebook4x: https://github.com/jupyter/notebook/archive/4.x.zip
38-
notebook50: https://github.com/jupyter/notebook/archive/5.0.0.zip
28+
notebook57: notebook==5.7
29+
notebook64: notebook==6.4
3930
notebookmaster: https://github.com/jupyter/notebook/archive/master.zip
4031
notebook: notebook
4132
pytest
@@ -65,7 +56,7 @@ commands =
6556
[testenv:coveralls]
6657
skip_install = true
6758
deps =
68-
coverage>=4.2
59+
coverage>=6.2
6960
coveralls
7061
commands =
7162
coverage combine --append
@@ -88,7 +79,7 @@ skip_install = true
8879
whitelist_externals = bash
8980
deps =
9081
appveyor-artifacts
91-
coverage>=4.2
82+
coverage>=6.2
9283
coveralls
9384
commands =
9485
appveyor-artifacts --owner-name=jcb91 --repo-name=jupyter-contrib-core --mangle-coverage download
@@ -101,15 +92,15 @@ commands =
10192

10293
[testenv:report]
10394
skip_install = true
104-
deps = coverage>=4.2
95+
deps = coverage>=6.2
10596
commands =
10697
coverage combine --append
10798
coverage report
10899
coverage html
109100

110101
[testenv:clean]
111102
skip_install = true
112-
deps = coverage>=4.2
103+
deps = coverage>=6.2
113104
commands = coverage erase
114105

115106
[testenv:bump]

0 commit comments

Comments
 (0)