Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ language: python
matrix:
fast_finish: true
include:
- python: 2.7
env: TOXENV=py27
- python: 3.6
env: TOXENV=py36
- python: 3.7
env: TOXENV=py37
- python: 3.8
env: TOXENV=py38
before_install:
- python -m pip install --upgrade virtualenv
install:
- pip install tox
- pip install -U tox

script: tox
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

FROM python:3.6-slim

RUN apt-get update && apt-get install -y curl git python2.7
RUN apt-get update && apt-get install -y curl git
WORKDIR /root/home
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python get-pip.py
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
RUN git clone https://github.com/SAP/cloud-pysec
WORKDIR /root/home/cloud-pysec
RUN pip install -r requirements-tests.txt
RUN pip3 install -r requirements-tests.txt
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ change the `USE_SAP_PY_JWT` environment variable to `true`.


# Requirements
*sap_xssec* requires either *python 2.7* or *python 3.7*.
*sap_xssec* requires *python 3.6* or newer.


# Download and Installation
Expand Down
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
'deprecation>=2.1.0',
'requests>=2.21.0',
'six>=1.11.0',
'pyjwt>=1.7.0',
'pyjwt>=2.0.1',
'{}'.format(sap_py_jwt_dep)
],
long_description=LONG_DESCRIPTION,
Expand All @@ -50,13 +50,10 @@
"Operating System :: POSIX :: Linux",
"Operating System :: Microsoft :: Windows",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
Expand Down
2 changes: 1 addition & 1 deletion tests/jwt_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ def sign(payload, headers=None):
"kid": "key-id-0"
}
payload = {k: payload[k] for k in payload if payload[k] is not None}
return jwt.encode(payload, PRIVATE_KEY, algorithm="RS256", headers=headers).decode("utf-8")
return jwt.encode(payload, PRIVATE_KEY, algorithm="RS256", headers=headers)
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[tox]
envlist = py27,py36
envlist = py36,py37,py38

[testenv]
allowlist_externals = env

deps = -rrequirements-tests.txt
commands = env SAP_EXT_JWT_ALG=* python -m unittest discover
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0
3.0.0