Skip to content

Commit

Permalink
Merge pull request #13 from Refinitiv/python311
Browse files Browse the repository at this point in the history
Bump Python versions, moved to GH Actions
  • Loading branch information
JonathanHuot committed Aug 23, 2023
2 parents fe4cbca + b65c963 commit c3782e6
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 44 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: GitHub Python Packaging
run-name: ${{ github.actor }} build and unittest
on:
push:
tags:
- '*'
jobs:
pypi-publish:
name: Upload release to PyPI
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/bottle-oauthlib
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
steps:
- name: Check out repository code
uses: actions/checkout@v3
- name: Install prereq
run: pip install wheel
- name: Build python package
run: python setup.py build
- name: Package python package
run: python setup.py sdist bdist_wheel
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
24 changes: 24 additions & 0 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: GitHub Python Build
run-name: ${{ github.actor }} build and unittest
on: [push]
jobs:
build:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11"]
runs-on: ubuntu-latest
steps:
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Check out repository code
uses: actions/checkout@v3
- name: Install prereq
run: pip install tox coveralls
- name: Run python tests
run: tox -e ${{ matrix.python }}
- name: Coveralls
run: coveralls
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# bottle-oauthlib

[![Jenkins build](https://api.travis-ci.org/Refinitiv/bottle-oauthlib.svg?branch=master)](https://travis-ci.org/Refinitiv/bottle-oauthlib)
[![Build](https://github.com/refinitiv/bottle-oauthlib/actions/workflows/python.yml/badge.svg)](https://github.com/Refinitiv/bottle-oauthlib/actions)
[![Coverage Status](https://coveralls.io/repos/github/Refinitiv/bottle-oauthlib/badge.svg?branch=master)](https://coveralls.io/github/Refinitiv/bottle-oauthlib?branch=master)
[![pip install bottle-oauthlib](https://img.shields.io/pypi/v/bottle-oauthlib.svg)](https://pypi.python.org/pypi/bottle-oauthlib)

Expand Down
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bottle==0.12.13
certifi==2017.7.27.1
chardet==3.0.4
idna==2.6
oauthlib==3.0.0
requests==2.18.4
urllib3==1.22
bottle==0.12.25
certifi==2023.7.22
charset-normalizer==3.2.0
idna==3.4
oauthlib==3.2.2
requests==2.31.0
urllib3==2.0.4
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
dependencies = fd.read().split('\n')

try:
version_tag = os.environ["TRAVIS_TAG"]
version_tag = os.environ["GITHUB_REF_NAME"]
except KeyError:
version_tag = "1.0.0"

Expand All @@ -29,6 +29,9 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
]
)
10 changes: 2 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
[tox]
envlist = py36,py37
envlist = py38,py39,py310,py311

[testenv]
deps =
nose
nose-timer
-rrequirements.txt
coverage
commands =
coverage erase
nosetests --with-timer
coverage run --append -m nose
coverage run --append -m unittest
coverage report
coverage html -d htmlcov-{envname}

[tox:jenkins]
envlist = py36

0 comments on commit c3782e6

Please sign in to comment.