From 309000eea46b940b779b1958f8eedd06f931550f Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Tue, 22 Aug 2023 13:04:28 +0200 Subject: [PATCH 1/9] Updated dependencies & move to GH Actions Removed nosetests for simplicity and migrate to GitHub Action as TravisCI is now no longer maintained for OSS projects. --- .github/workflows/python.yml | 20 ++++++++++++++++++++ requirements.txt | 14 +++++++------- setup.py | 5 ++++- tox.ini | 10 ++-------- 4 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/python.yml diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml new file mode 100644 index 0000000..6b1648e --- /dev/null +++ b/.github/workflows/python.yml @@ -0,0 +1,20 @@ +name: GitHub Python Build +run-name: ${{ github.actor }} build and unittest +on: [push] +jobs: + build: + 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 ${{ env.python }} diff --git a/requirements.txt b/requirements.txt index 0dd1df7..0206df3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/setup.py b/setup.py index 343d1a7..e7641b8 100644 --- a/setup.py +++ b/setup.py @@ -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', ] ) diff --git a/tox.ini b/tox.ini index e238f19..3bbc8f6 100644 --- a/tox.ini +++ b/tox.ini @@ -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 From bd8e96870134d320480a9a20f244fbd27606d147 Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 10:54:59 +0200 Subject: [PATCH 2/9] Fix typo --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 6b1648e..4286591 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -17,4 +17,4 @@ jobs: - name: Install prereq run: pip install tox coveralls - name: Run python tests - run: tox -e ${{ env.python }} + run: tox -e ${{ matrix.python }} From 06b3af1e1c2c6cf2e7e4abf9ca185a6eb1d43a49 Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 11:31:57 +0200 Subject: [PATCH 3/9] Add coveralls report --- .github/workflows/python.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 4286591..a93d02e 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -18,3 +18,5 @@ jobs: run: pip install tox coveralls - name: Run python tests run: tox -e ${{ matrix.python }} + - name: Coveralls + run: coveralls From 4055ef5a9bc3f87aed0528983e25f8b874ddce78 Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 11:32:12 +0200 Subject: [PATCH 4/9] Change readme logo to GH Action --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 207f82e..90ed294 100644 --- a/README.md +++ b/README.md @@ -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) From 94698d3e9c4ee9cc5f61144282f94f3c0a2e20eb Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 11:32:33 +0200 Subject: [PATCH 5/9] Add publishing on tag --- .github/workflows/publish.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..b204222 --- /dev/null +++ b/.github/workflows/publish.yml @@ -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 From 65175cfb815283b0fdaff503673b5ba8761a7b36 Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 11:40:06 +0200 Subject: [PATCH 6/9] Add token to coveralls api --- .github/workflows/python.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index a93d02e..b798371 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -3,6 +3,8 @@ 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"] From e8db45fddfcb7bc2893cf34a1bd4725f6be4ec55 Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 11:42:26 +0200 Subject: [PATCH 7/9] Fix typo in build badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90ed294..032ca7a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # bottle-oauthlib -[![Build](https://github.com/refinitiv/bottle-oauthlib/actions/workflows/python.yml/badge.svg](https://github.com/Refinitiv/bottle-oauthlib/actions) +[![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) From 1d2134eb032d80f4bf7f2cbcc5265052c77a830b Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 11:45:36 +0200 Subject: [PATCH 8/9] Removed travis configuration --- .travis.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 46e9e22..0000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: python -python: 3.7 -dist: xenial -sudo: false -cache: pip -matrix: - include: - - python: 3.6 - env: TOXENV=py36 - - python: 3.7 - env: TOXENV=py37 -before_install: -- pip install tox coveralls -script: -- tox -after_success: -- coveralls -deploy: - provider: pypi - on: - tags: true - python: 3.6 - distributions: sdist bdist_wheel - user: thomsonreuters-edge - password: - secure: SpCg+ldvZYv3nObvKn16A/te0FRyOrPLcS7zpBummJtMNkZlTwvuc5LZW5uzoae4g69JxcfqKmav9A3SxWq77EE0kCvTwIHsLlNifui44RRr48PKDrdsqizY1N2Ltt3gD3jjIpbKa4Uool5Ffwno77H/iNJU27JsQZCuXhkyzK59E/MeUtAo0+rbqiUySADMJFCKGGgDUQdfe4qPOdi8t9wOXwnqnogHDbDXdXUML+eM28DGIqD7SLacoq/HATAc0gGhFdpifP40mYqM936CFXTytvgmY3jVOSjFIpim4AjZyK68pIHEIOWbwXVHn6/PSUheMu1UoS157ywa2qfyDmdr7Nlf+qbuw0CE38AgDys6ButV/rlibVsiVcmdeA0eIkgWEEIQQ2IgsnBuIOv9nD2pukYtxYl+Vwbb8J8DTEBvXbPIQtxFUnHJLPUYd7aQk4z7oiBSl4ORfCXkJ6o1ZOngODkbAx1DRoo+tvqp7ihZXSsBajQUa71v1X0YvBI7a/2UtbqRNzEne/hVg0gTAdoQh4FhOeFQkv5fu8AyMRVDwlx0o3S2K48JeBgx1p/jK1rX64038Q6dCU29+gCgDH3PF/yQ7NX0WuYZdrBQ4JCxU8QcnyZtvBye63piZkREOwVbiM9y1AKelW92k0gVDNMBN4un/+aXF2c0Kqwh94E= From b65c963c779b9c5eea6a70f4ac40fa642410934c Mon Sep 17 00:00:00 2001 From: Jonathan Huot Date: Wed, 23 Aug 2023 11:54:09 +0200 Subject: [PATCH 9/9] Add version in python package from GH --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e7641b8..32510d0 100644 --- a/setup.py +++ b/setup.py @@ -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"