Migrate to GitHub Actions.

.bumpversion.cfg

@@ -1,6 +1,5 @@
 [bumpversion]
 current_version = 1.7.1
-files = setup.py docs/conf.py
 commit = True
 tag = True
 tag_name = {new_version}

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: Release
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    if: github.repository == 'jazzband/django-user-sessions'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - 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 setuptools twine wheel
+
+      - name: Build package
+        run: |
+          python setup.py --version
+          python setup.py sdist --format=gztar bdist_wheel
+          twine check dist/*
+
+      - name: Upload packages to Jazzband
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: jazzband
+          password: ${{ secrets.JAZZBAND_RELEASE_KEY }}
+          repository_url: https://jazzband.co/projects/django-user-sessions/upload

.github/workflows/test.yml

@@ -0,0 +1,52 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 5
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9']
+        django-version: ['2.2', '3.0', '3.1', 'master']
+
+    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.python-version }}-v1-${{ hashFiles('**/setup.py') }}
+        restore-keys: |
+          ${{ matrix.python-version }}-v1-
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade tox tox-gh-actions
+
+    - name: Tox tests
+      run: |
+        tox -v
+      env:
+        DJANGO: ${{ matrix.django-version }}
+
+    - name: Upload coverage
+      uses: codecov/codecov-action@v1
+      with:
+        name: Python ${{ matrix.python-version }}

.gitignore

@@ -5,7 +5,7 @@
 /htmlcov/
 
 /.coverage
-
+coverage.xml
 /.tox/
 
 /docs/_build/

README.rst

@@ -6,9 +6,9 @@ Django User Sessions
     :target: https://jazzband.co/
     :alt: Jazzband
 
-.. image:: https://travis-ci.org/jazzband/django-user-sessions.svg?branch=master
-    :alt: Build Status
-    :target: https://travis-ci.org/jazzband/django-user-sessions
+.. image:: https://github.com/jazzband/django-user-sessions/workflows/Test/badge.svg
+    :alt: GitHub Actions
+    :target: https://github.com/jazzband/django-user-sessions/actions
 
 .. image:: https://codecov.io/gh/jazzband/django-user-sessions/branch/master/graph/badge.svg
     :alt: Test Coverage
@@ -35,7 +35,7 @@ contains the package `django-two-factor-auth`_, but that application is not a
 dependency for this package. Also have a look at the bundled example templates
 and views to see how you can integrate the application into your project.
 
-Compatible with Django 2.2, 3,0 and 3.1 on Python 3.6, 3.7, 3.8 and 3.9.
+Compatible with Django 2.2, 3.0 and 3.1 on Python 3.6, 3.7, 3.8 and 3.9.
 Documentation is available at `readthedocs.org`_.
 
 

docs/conf.py

@@ -13,7 +13,7 @@
 # serve to show the default.
 
 import os
-import sys
+from pkg_resources import get_distribution
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -54,10 +54,9 @@
 #
 
 # The full version, including alpha/beta/rc tags.
-release = '1.7.1'
-
-# The short X.Y version.
-version = '.'.join(release.split('.')[0:2])
+release = get_distribution('django-user-sessions').version
+# for example take major/minor
+version = '.'.join(release.split('.')[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/release-notes.rst

@@ -1,6 +1,13 @@
 Release Notes
 =============
 
+Unreleased
+----------
+* New: Support for Django 3.0 and 3.1.
+* New: Support for Python 3.9.
+* Moved CI to GitHub Actions.
+* Dropped Python 3.5 support.
+
 1.7.0
 -----
 * new: Support for Django 2.2+.

setup.py

@@ -2,7 +2,8 @@
 
 setup(
     name='django-user-sessions',
-    version='1.7.1',
+    use_scm_version={"version_scheme": "post-release"},
+    setup_requires=["setuptools_scm"],
     description='Django sessions with a foreign key to the user',
     long_description=open('README.rst').read(),
     author='Bouke Haarsma',
@@ -19,6 +20,7 @@
         'Framework :: Django',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',

tox.ini

@@ -2,23 +2,28 @@
 ; Minimum version of Tox
 minversion = 1.8
 envlist =
-    py{36,37,38,39}-{dj22,dj30,dj31,djmaster},
+    py{36,37,38,39}-dj{22,30,31,master}
     flake8
 
-[travis]
-unignore_outcomes = True
+[gh-actions]
+python =
+    3.6: py36
+    3.7: py37
+    3.8: py38, flake8
+    3.9: py39
 
-[travis:env]
+[gh-actions:env]
 DJANGO =
     2.2: dj22
     3.0: dj30
     3.1: dj31
     master: djmaster
 
 [testenv]
-commands = 
+commands =
     coverage run {envbindir}/django-admin test -v 2 --pythonpath=./ --settings=tests.settings
     coverage report
+    coverage xml
 deps =
     coverage
     dj22: Django<2.3

user_sessions/__init__.py

@@ -0,0 +1,7 @@
+from pkg_resources import get_distribution, DistributionNotFound
+
+try:
+    __version__ = get_distribution("django-user-sessions").version
+except DistributionNotFound:
+    # package is not installed
+    __version__ = None