Merge pull request #352 from pylast/rm-travis

2020-11-17 18:14:37 +02:00 · 2020-11-17 18:14:37 +02:00 · 46a3dbf4a6
parent 69d5d6ec9a 9033debfcd
commit 46a3dbf4a6
12 changed files with 159 additions and 116 deletions
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@ -1,5 +1,5 @@
-name-template: "$NEXT_PATCH_VERSION"
-tag-template: "$NEXT_PATCH_VERSION"
+name-template: "Release $RESOLVED_VERSION"
+tag-template: "$RESOLVED_VERSION"

 categories:
  - title: "Added"
@ -26,3 +26,20 @@ template: |
  ## Changes

  $CHANGES
+
+version-resolver:
+  major:
+    labels:
+      - "changelog: Removed"
+  minor:
+    labels:
+      - "changelog: Added"
+      - "changelog: Changed"
+      - "changelog: Deprecated"
+      - "enhancement"
+
+  patch:
+    labels:
+      - "changelog: Fixed"
+      - "bug"
+  default: minor
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@ -0,0 +1,57 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - master
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    if: github.repository == 'pylast/pylast'
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: deploy-${{ hashFiles('**/setup.py') }}
+          restore-keys: |
+            deploy-
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U setuptools twine wheel
+
+      - name: Build package
+        run: |
+          python setup.py --version
+          python setup.py sdist --format=gztar bdist_wheel
+          twine check dist/*
+
+      - name: Publish package to PyPI
+        if: github.event.action == 'published'
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}
+
+      - name: Publish package to TestPyPI
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: __token__
+          password: ${{ secrets.test_pypi_password }}
+          repository_url: https://test.pypi.org/legacy/
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@ -11,5 +11,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - uses: micnncim/action-label-syncer@v1
+        with:
+          prune: false
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@ -2,39 +2,11 @@ name: Lint

 on: [push, pull_request]

-env:
-  FORCE_COLOR: 1
-
 jobs:
  build:
    runs-on: ubuntu-20.04

    steps:
      - uses: actions/checkout@v2
-
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/pip
-            ~/.cache/pre-commit
-          key:
-            lint-v2-${{ hashFiles('**/setup.py') }}-${{
-            hashFiles('**/.pre-commit-config.yaml') }}
-          restore-keys: |
-            lint-v2-
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Install dependencies
-        run: |
-          python -m pip install -U pip
-          python -m pip install -U tox
-
-      - name: Lint
-        run: tox -e lint
-        env:
-          PRE_COMMIT_COLOR: always
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/action@v2.0.0
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -0,0 +1,63 @@
+name: Test
+
+on: [push, pull_request]
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10-dev", "pypy3"]
+        os: [ubuntu-20.04]
+        include:
+          # Include new variables for Codecov
+          - { codecov-flag: GHA_Ubuntu2004, os: ubuntu-20.04 }
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key:
+            ${{ matrix.os }}-${{ matrix.python-version }}-v3-${{
+            hashFiles('**/setup.py') }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.python-version }}-v3-
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U wheel
+          python -m pip install -U tox
+
+      - name: Tox tests
+        shell: bash
+        run: |
+          tox -e py
+        env:
+          PYLAST_API_KEY: ${{ secrets.PYLAST_API_KEY }}
+          PYLAST_API_SECRET: ${{ secrets.PYLAST_API_SECRET }}
+          PYLAST_PASSWORD_HASH: ${{ secrets.PYLAST_PASSWORD_HASH }}
+          PYLAST_USERNAME: ${{ secrets.PYLAST_USERNAME }}
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v1
+        with:
+          flags: ${{ matrix.codecov-flag }}
+          name: ${{ matrix.os }} Python ${{ matrix.python-version }}
--- a/.mergify.yml
+++ b/.mergify.yml
@ -3,8 +3,6 @@ pull_request_rules:
    conditions:
      - label=automerge
      - status-success=build
-      - status-success=continuous-integration/travis-ci/pr
-      - status-success=continuous-integration/travis-ci/push
    actions:
      merge:
        method: merge
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.2
+    rev: v2.7.4
    hooks:
      - id: pyupgrade
        args: ["--py36-plus"]
@ -15,7 +15,7 @@ repos:
        types: []

  - repo: https://github.com/PyCQA/isort
-    rev: 5.5.4
+    rev: 5.6.4
    hooks:
      - id: isort

@ -26,12 +26,12 @@ repos:
        additional_dependencies: [flake8-2020, flake8-implicit-str-concat]

  - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.6.0
+    rev: v1.7.0
    hooks:
      - id: python-check-blanket-noqa

  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.3.0
    hooks:
      - id: check-merge-conflict
      - id: check-yaml
--- a/.travis.yml
+++ b/.travis.yml
@ -1,66 +0,0 @@
-language: python
-cache:
-  pip: true
-  directories:
-    - $HOME/.cache/pre-commit
-
-env:
-  global:
-  - secure: ivg6II471E9HV8xyqnawLIuP/sZ0J63Y+BC0BQcRVKtLn/K3zmD1ozM3TFL9S549Nxd0FqDKHXJvXsgaTGIDpK8sxE2AMKV5IojyM0iAVuN7YjPK9vwSlRw1u0EysPMFqxOZVQnoDyHrSGIUrP/VMdnhBu6dbUX0FyEkvZshXhY=
-  - secure: gDWNEYA1EUv4G230/KzcTgcmEST0nf2FeW/z/prsoQBu+TWw1rKKSJAJeMLvuI1z4aYqqNYdmqjWyNhhVK3p5wmFP2lxbhaBT1jDsxxFpePc0nUkdAQOOD0yBpbBGkqkjjxU34HjTX2NFNEbcM3izVVE9oQmS5r4oFFNJgdL91c=
-  - secure: RpsZblHFU7a5dnkO/JUgi70RkNJwoUh3jJqVo1oOLjL+lvuAmPXhI8MDk2diUk43X+XCBFBEnm7UCGnjUF+hDnobO4T+VrIFuVJWg3C7iKIT+YWvgG6A+CSeo/P0I0dAeUscTr5z4ylOq3EDx4MFSa8DmoWMmjKTAG1GAeTlY2k=
-  - secure: T5OKyd5Bs0nZbUr+YICbThC5GrFq/kUjX8FokzCv7NWsYaUWIwEmMXXzoYALoB3A+rAglOx6GABaupoNKKg3tFQyxXphuMKpZ8MasMAMFjFW0d7wsgGy0ylhVwrgoKzDbCQ5FKbohC+9ltLs+kKMCQ0L+MI70a/zTfF4/dVWO/o=
-  - secure: DxBvGGoIgbAeuuU3A6+J1HBbmUAEvqdmK73etw+yNKDLGvvukgTL33dNCr8CZXLKRRvfhrjU7Q01GUpOTxrVQ9nJgsD55kwx0wPtuBWIF80M2m4SPsiVLlwP/LFYD5JMDTDWjFTlVahma8P7qoLjCc7b/RgigWLidH19snQmjdY=
-  - secure: VPARlWNg/0Nit7a924vJlDfv7yiuTDtrcGZNFrZ6yN3dl8ZjVPizQXQNKA3yq0y2jW25nwjRwZYj3eY5MdM9F7Sw51d+/8AjFtdCuRgDvwlQFR/pCoyzqgJATkXKo7mlejvnA+5EKUzAmu3drIbboFgbLgRTMrG7b/ot9tazTHs=
-  - secure: CQYL7MH6tSVrCcluIfWfDSTo4E/p+9pF0eI7Vtf0oaZBzyulODHK8h/mzJp4HwezyfOu0RCedq6sloGQr1/29CvWWESaYyoGoGz9Mz2ZS+MpIcjGISfZa+x4vSp6QPFvd4i/1Z/1j2gJVVyswkrIVUwZIDJtfAKzZI5iHx2gH8Y=
-  - secure: SsKJoJwtDVWrL5xxl9C/gTRy6FhfRQQNNAFOogl9mTs/WeI2t9QTYoKsxLPXOdoRdu4MvT3h/B2sjwggt7zP81fBVxQRTkg4nq0zSHlj0NqclbFa6I5lUYdGwH9gPk/HWJJwXhKRDsqn/iRw2v+qBDs/j3kIgPQ0yjM58LEPXic=
-
-matrix:
-  fast_finish: true
-  include:
-    - python: 3.8
-      env: TOXENV=lint
-    - python: 3.9
-    - python: 3.8
-    - python: 3.7
-    - python: 3.6
-    - python: 3.10-dev
-    - python: pypy3
-
-install:
- travis_retry pip install -U pip
- travis_retry pip install -U tox-travis
-
-script: tox
-
-after_success:
-  - |
-    if [ "$TOXENV" != "lint" ]; then
-      travis_retry pip install -U coveralls && coveralls
-      travis_retry pip install -U codecov && codecov
-    fi
-
-deploy:
-  - provider: pypi
-    server: https://test.pypi.org/legacy/
-    on:
-      tags: false
-      repo: pylast/pylast
-      branch: master
-      condition: $TOXENV = lint
-    user: hugovk
-    password:
-      secure: "OCNT7Sf7TpS6aKuqBXEWxJZjmEpdERTBp/yllOd9xnpFt2ZL96CyKtAhPA8zu5OP58QFEZSafZRfXYJoz78RDrx3gOdRXCFT00vXIMnjVvrAlieNEHCVAT0kRW9lYK1Cf5baHYsOYIs6EZf2fEAhdzvmh83G4Y1Y+FPR9tA6uy8="
-    distributions: sdist --format=gztar bdist_wheel
-    skip_existing: true
-  - provider: pypi
-    on:
-      tags: true
-      repo: pylast/pylast
-      branch: master
-      condition: $TOXENV = lint
-    user: hugovk
-    password:
-      secure: "OCNT7Sf7TpS6aKuqBXEWxJZjmEpdERTBp/yllOd9xnpFt2ZL96CyKtAhPA8zu5OP58QFEZSafZRfXYJoz78RDrx3gOdRXCFT00vXIMnjVvrAlieNEHCVAT0kRW9lYK1Cf5baHYsOYIs6EZf2fEAhdzvmh83G4Y1Y+FPR9tA6uy8="
-    distributions: sdist --format=gztar bdist_wheel
-    skip_existing: true
--- a/README.md
+++ b/README.md
@ -4,10 +4,9 @@ pyLast
 [![PyPI version](https://img.shields.io/pypi/v/pylast.svg)](https://pypi.org/project/pylast/)
 [![Supported Python versions](https://img.shields.io/pypi/pyversions/pylast.svg)](https://pypi.org/project/pylast/)
 [![PyPI downloads](https://img.shields.io/pypi/dm/pylast.svg)](https://pypistats.org/packages/pylast)
-[![Build status](https://travis-ci.org/pylast/pylast.svg?branch=master)](https://travis-ci.org/pylast/pylast)
+[![Test](https://github.com/pylast/pylast/workflows/Test/badge.svg)](https://github.com/pylast/pylast/actions)
 [![Coverage (Codecov)](https://codecov.io/gh/pylast/pylast/branch/master/graph/badge.svg)](https://codecov.io/gh/pylast/pylast)
-[![Coverage (Coveralls)](https://coveralls.io/repos/github/pylast/pylast/badge.svg?branch=master)](https://coveralls.io/github/pylast/pylast?branch=master)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![DOI](https://zenodo.org/badge/7803088.svg)](https://zenodo.org/badge/latestdoi/7803088)

 A Python interface to [Last.fm](https://www.last.fm/) and other API-compatible websites such as [Libre.fm](https://libre.fm/).
--- a/RELEASING.md
+++ b/RELEASING.md
@ -1,8 +1,9 @@
 # Release Checklist

 * [ ] Get master to the appropriate code release state.
-      [Travis CI](https://travis-ci.org/pylast/pylast) should be running cleanly for
+      [GitHub Actions](https://github.com/pylast/pylast/actions) should be running cleanly for
      all merges to master.
+      [![Test](https://github.com/pylast/pylast/workflows/Test/badge.svg)](https://github.com/pylast/pylast/actions)

 * [ ] Edit release draft, adjust text if needed:
      https://github.com/pylast/pylast/releases
@ -13,8 +14,8 @@

 * [ ] Publish release

-* [ ] Check the tagged [Travis CI build](https://travis-ci.org/pylast/pylast) has
-      deployed to [PyPI](https://pypi.org/project/pylast/#history)
+* [ ] Check the tagged [GitHub Actions build](https://github.com/pylast/pylast/actions?query=workflow%3ADeploy)
+      has deployed to [PyPI](https://pypi.org/project/pylast/#history)

 * [ ] Check installation:

--- a/tests/test_network.py
+++ b/tests/test_network.py
@ -64,7 +64,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
        self.network.enable_rate_limit()
        then = time.time()
        # Make some network call, limit not applied first time
-        self.network.get_user(self.username)
+        self.network.get_top_artists()
        # Make a second network call, limiting should be applied
        self.network.get_top_artists()
        now = time.time()
--- a/tox.ini
+++ b/tox.ini
@ -3,11 +3,11 @@ envlist =
    py{py3, 310, 39, 38, 37, 36}

 [testenv]
-setenv =
-    PYLAST_API_KEY = {env:PYLAST_API_KEY:}
-    PYLAST_API_SECRET = {env:PYLAST_API_SECRET:}
-    PYLAST_PASSWORD_HASH = {env:PYLAST_PASSWORD_HASH:}
-    PYLAST_USERNAME = {env:PYLAST_USERNAME:}
+passenv =
+    PYLAST_API_KEY
+    PYLAST_API_SECRET
+    PYLAST_PASSWORD_HASH
+    PYLAST_USERNAME
 extras =
    tests
 commands =