Skip to content

Commit 364121b

Browse files
committed
Update docs and project URL
Version is now at 0.3.0, docs were still sayion 0.1.0. Also update setup.py to the correct URL for the project. Change classifiers and other code to properly test with 3.4 and 3.5, drop 3.3 as it is untested at this point. Signed-off-by: Simo Sorce <[email protected]> Reviewed-by: Christian Heimes <[email protected]> Closes #51
1 parent 9273115 commit 364121b

File tree

5 files changed

+44
-30
lines changed

5 files changed

+44
-30
lines changed

.travis.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
1+
sudo: false
2+
13
language: python
24

3-
python:
4-
- "2.7"
5+
cache: pip
56

6-
branches:
7-
only:
8-
- master
7+
matrix:
8+
include:
9+
- python: 2.7
10+
env: TOXENV=py27
11+
- python: 3.4
12+
env: TOXENV=py34
13+
- python: 3.5
14+
env: TOXENV=py35
15+
- python: 3.5
16+
env: TOXENV=doc
17+
- python: 3.5
18+
env: TOXENV=sphinx
19+
- python: 3.5
20+
env: TOXENV=lint
21+
- python: 2.7
22+
env: TOXENV=pep8py2
23+
- python: 3.5
24+
env: TOXENV=pep8py3
925

1026
install:
27+
- pip install --upgrade pip setuptools
28+
- pip --version
1129
- pip install tox
30+
- tox --version
1231

1332
script:
1433
- tox
15-
16-
env:
17-
- TOXENV=pep8
18-
- TOXENV=py3pep8
19-
- TOXENV=lint
20-
- TOXENV=py27
21-
- TOXENV=py34
22-
- TOXENV=doc
23-
- TOXENV=sphinx

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ lint:
77

88
pep8:
99
# Check style consistency
10-
tox -e pep8
10+
tox -e pep8py2
11+
tox -e pep8py3
1112

1213
clean:
1314
rm -fr build dist *.egg-info
@@ -19,7 +20,8 @@ cscope:
1920
test:
2021
rm -f .coverage
2122
tox -e py27
22-
tox -e py34
23+
tox -e py34 --skip-missing-interpreter
24+
tox -e py35 --skip-missing-interpreter
2325

2426
DOCS_DIR = docs
2527
.PHONY: docs

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646

4747
# General information about the project.
4848
project = u'JWCrypto'
49-
copyright = u'2015, JWCrypto Contributors'
49+
copyright = u'2016, JWCrypto Contributors'
5050

5151
# The version info for the project you're documenting, acts as replacement for
5252
# |version| and |release|, also used in various other places throughout the
5353
# built documents.
5454
#
5555
# The short X.Y version.
56-
version = '0.1'
56+
version = '0.3'
5757
# The full version, including alpha/beta/rc tags.
58-
release = '0.1.0'
58+
release = '0.3.0'
5959

6060
# The language for content autogenerated by Sphinx. Refer to documentation
6161
# for a list of supported languages.

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
license = 'LGPLv3+',
1111
maintainer = 'JWCrypto Project Contributors',
1212
maintainer_email = '[email protected]',
13-
url='https://github.com/simo5/jwcrypto',
13+
url='https://github.com/latchset/jwcrypto',
1414
packages = ['jwcrypto'],
1515
description = 'Implementation of JOSE Web standards',
1616
classifiers = [
1717
'Programming Language :: Python :: 2.7',
18-
'Programming Language :: Python :: 3.3',
18+
'Programming Language :: Python :: 3.4',
19+
'Programming Language :: Python :: 3.5',
1920
'Intended Audience :: Developers',
2021
'Topic :: Security',
2122
'Topic :: Software Development :: Libraries :: Python Modules'

tox.ini

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[tox]
2-
envlist = py27,py34,doc,sphinx
2+
envlist = lint,py27,py34,py35,pep8py2,pep8py3,doc,sphinx
3+
skip_missing_interpreters = true
34

45
[testenv]
56
setenv =
@@ -10,8 +11,8 @@ deps =
1011
-r{toxinidir}/requirements.txt
1112
sitepackages = True
1213
commands =
13-
coverage run -m pytest --capture=no --strict {posargs}
14-
coverage report -m
14+
{envpython} -m coverage run -m pytest --capture=no --strict {posargs}
15+
{envpython} -m coverage report -m
1516

1617
[testenv:lint]
1718
basepython = python2.7
@@ -20,25 +21,25 @@ deps =
2021
-r{toxinidir}/requirements.txt
2122
sitepackages = True
2223
commands =
23-
pylint -d c,r,i,W0613 -r n -f colorized --notes= --disable=star-args ./jwcrypto
24+
{envpython} -m pylint -d c,r,i,W0613 -r n -f colorized --notes= --disable=star-args ./jwcrypto
2425

25-
[testenv:pep8]
26+
[testenv:pep8py2]
2627
basepython = python2.7
2728
deps =
2829
flake8
2930
flake8-import-order
3031
pep8-naming
3132
commands =
32-
flake8 {posargs} jwcrypto
33+
{envpython} -m flake8 {posargs} jwcrypto
3334

34-
[testenv:py3pep8]
35-
basepython = python3.4
35+
[testenv:pep8py3]
36+
basepython = python3
3637
deps =
3738
flake8
3839
flake8-import-order
3940
pep8-naming
4041
commands =
41-
flake8 {posargs} jwcrypto
42+
{envpython} -m flake8 {posargs} jwcrypto
4243

4344
[testenv:doc]
4445
deps =

0 commit comments

Comments
 (0)