Commit 364121b4 authored by Simo Sorce's avatar Simo Sorce

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: 's avatarSimo Sorce <simo@redhat.com>
Reviewed-by: 's avatarChristian Heimes <cheimes@redhat.com>
Closes #51
parent 92731158
sudo: false
language: python language: python
python: cache: pip
- "2.7"
branches: matrix:
only: include:
- master - python: 2.7
env: TOXENV=py27
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.5
env: TOXENV=doc
- python: 3.5
env: TOXENV=sphinx
- python: 3.5
env: TOXENV=lint
- python: 2.7
env: TOXENV=pep8py2
- python: 3.5
env: TOXENV=pep8py3
install: install:
- pip install --upgrade pip setuptools
- pip --version
- pip install tox - pip install tox
- tox --version
script: script:
- tox - tox
env:
- TOXENV=pep8
- TOXENV=py3pep8
- TOXENV=lint
- TOXENV=py27
- TOXENV=py34
- TOXENV=doc
- TOXENV=sphinx
...@@ -7,7 +7,8 @@ lint: ...@@ -7,7 +7,8 @@ lint:
pep8: pep8:
# Check style consistency # Check style consistency
tox -e pep8 tox -e pep8py2
tox -e pep8py3
clean: clean:
rm -fr build dist *.egg-info rm -fr build dist *.egg-info
...@@ -19,7 +20,8 @@ cscope: ...@@ -19,7 +20,8 @@ cscope:
test: test:
rm -f .coverage rm -f .coverage
tox -e py27 tox -e py27
tox -e py34 tox -e py34 --skip-missing-interpreter
tox -e py35 --skip-missing-interpreter
DOCS_DIR = docs DOCS_DIR = docs
.PHONY: docs .PHONY: docs
......
...@@ -46,16 +46,16 @@ master_doc = 'index' ...@@ -46,16 +46,16 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'JWCrypto' project = u'JWCrypto'
copyright = u'2015, JWCrypto Contributors' copyright = u'2016, JWCrypto Contributors'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.1' version = '0.3'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.1.0' release = '0.3.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -10,12 +10,13 @@ setup( ...@@ -10,12 +10,13 @@ setup(
license = 'LGPLv3+', license = 'LGPLv3+',
maintainer = 'JWCrypto Project Contributors', maintainer = 'JWCrypto Project Contributors',
maintainer_email = 'simo@redhat.com', maintainer_email = 'simo@redhat.com',
url='https://github.com/simo5/jwcrypto', url='https://github.com/latchset/jwcrypto',
packages = ['jwcrypto'], packages = ['jwcrypto'],
description = 'Implementation of JOSE Web standards', description = 'Implementation of JOSE Web standards',
classifiers = [ classifiers = [
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'Topic :: Security', 'Topic :: Security',
'Topic :: Software Development :: Libraries :: Python Modules' 'Topic :: Software Development :: Libraries :: Python Modules'
......
[tox] [tox]
envlist = py27,py34,doc,sphinx envlist = lint,py27,py34,py35,pep8py2,pep8py3,doc,sphinx
skip_missing_interpreters = true
[testenv] [testenv]
setenv = setenv =
...@@ -10,8 +11,8 @@ deps = ...@@ -10,8 +11,8 @@ deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
sitepackages = True sitepackages = True
commands = commands =
coverage run -m pytest --capture=no --strict {posargs} {envpython} -m coverage run -m pytest --capture=no --strict {posargs}
coverage report -m {envpython} -m coverage report -m
[testenv:lint] [testenv:lint]
basepython = python2.7 basepython = python2.7
...@@ -20,25 +21,25 @@ deps = ...@@ -20,25 +21,25 @@ deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
sitepackages = True sitepackages = True
commands = commands =
pylint -d c,r,i,W0613 -r n -f colorized --notes= --disable=star-args ./jwcrypto {envpython} -m pylint -d c,r,i,W0613 -r n -f colorized --notes= --disable=star-args ./jwcrypto
[testenv:pep8] [testenv:pep8py2]
basepython = python2.7 basepython = python2.7
deps = deps =
flake8 flake8
flake8-import-order flake8-import-order
pep8-naming pep8-naming
commands = commands =
flake8 {posargs} jwcrypto {envpython} -m flake8 {posargs} jwcrypto
[testenv:py3pep8] [testenv:pep8py3]
basepython = python3.4 basepython = python3
deps = deps =
flake8 flake8
flake8-import-order flake8-import-order
pep8-naming pep8-naming
commands = commands =
flake8 {posargs} jwcrypto {envpython} -m flake8 {posargs} jwcrypto
[testenv:doc] [testenv:doc]
deps = deps =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment