Skip to content

Commit 594688d

Browse files
jezdezjezdez
authored
Migrate to GitHub Actions. (#126)
* Add GitHub Actions test workflow. * Write coverage xml. * Update badge. * Add release workflow. * Add 3.1. * Remove Travis. * Update release notes. * Use setuptools_scm. * Update Trove classifiers. * Don't update any files since using setuptools_scm. * Update Readme. * Remove unneeded files config. * Use django-admin script.
1 parent 9892add commit 594688d

File tree

11 files changed

+128
-43
lines changed

11 files changed

+128
-43
lines changed

‎.bumpversion.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[bumpversion]
22
current_version = 1.7.1
3-
files = setup.py docs/conf.py
43
commit = True
54
tag = True
65
tag_name = {new_version}

‎.github/workflows/release.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
build:
10+
if: github.repository == 'jazzband/django-user-sessions'
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Set up Python
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: 3.8
22+
23+
- name: Install dependencies
24+
run: |
25+
python -m pip install -U pip
26+
python -m pip install -U setuptools twine wheel
27+
28+
- name: Build package
29+
run: |
30+
python setup.py --version
31+
python setup.py sdist --format=gztar bdist_wheel
32+
twine check dist/*
33+
34+
- name: Upload packages to Jazzband
35+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
36+
uses: pypa/gh-action-pypi-publish@master
37+
with:
38+
user: jazzband
39+
password: ${{ secrets.JAZZBAND_RELEASE_KEY }}
40+
repository_url: https://jazzband.co/projects/django-user-sessions/upload

‎.github/workflows/test.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Test
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: false
11+
max-parallel: 5
12+
matrix:
13+
python-version: ['3.6', '3.7', '3.8', '3.9']
14+
django-version: ['2.2', '3.0', '3.1', 'master']
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
19+
- name: Set up Python ${{ matrix.python-version }}
20+
uses: actions/setup-python@v2
21+
with:
22+
python-version: ${{ matrix.python-version }}
23+
24+
- name: Get pip cache dir
25+
id: pip-cache
26+
run: |
27+
echo "::set-output name=dir::$(pip cache dir)"
28+
29+
- name: Cache
30+
uses: actions/cache@v2
31+
with:
32+
path: ${{ steps.pip-cache.outputs.dir }}
33+
key:
34+
${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}
35+
restore-keys: |
36+
${{ matrix.python-version }}-v1-
37+
38+
- name: Install dependencies
39+
run: |
40+
python -m pip install --upgrade pip
41+
python -m pip install --upgrade tox tox-gh-actions
42+
43+
- name: Tox tests
44+
run: |
45+
tox -v
46+
env:
47+
DJANGO: ${{ matrix.django-version }}
48+
49+
- name: Upload coverage
50+
uses: codecov/codecov-action@v1
51+
with:
52+
name: Python ${{ matrix.python-version }}

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/htmlcov/
66

77
/.coverage
8-
8+
coverage.xml
99
/.tox/
1010

1111
/docs/_build/

‎.travis.yml

-26
This file was deleted.

‎README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Django User Sessions
66
:target: https://jazzband.co/
77
:alt: Jazzband
88

9-
.. image:: https://travis-ci.org/jazzband/django-user-sessions.svg?branch=master
10-
:alt: Build Status
11-
:target: https://travis-ci.org/jazzband/django-user-sessions
9+
.. image:: https://github.com/jazzband/django-user-sessions/workflows/Test/badge.svg
10+
:alt: GitHub Actions
11+
:target: https://github.com/jazzband/django-user-sessions/actions
1212

1313
.. image:: https://codecov.io/gh/jazzband/django-user-sessions/branch/master/graph/badge.svg
1414
:alt: Test Coverage
@@ -35,7 +35,7 @@ contains the package `django-two-factor-auth`_, but that application is not a
3535
dependency for this package. Also have a look at the bundled example templates
3636
and views to see how you can integrate the application into your project.
3737

38-
Compatible with Django 2.2, 3,0 and 3.1 on Python 3.6, 3.7, 3.8 and 3.9.
38+
Compatible with Django 2.2, 3.0 and 3.1 on Python 3.6, 3.7, 3.8 and 3.9.
3939
Documentation is available at `readthedocs.org`_.
4040

4141

‎docs/conf.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# serve to show the default.
1414

1515
import os
16-
import sys
16+
from pkg_resources import get_distribution
1717

1818
# If extensions (or modules to document with autodoc) are in another directory,
1919
# add these directories to sys.path here. If the directory is relative to the
@@ -54,10 +54,9 @@
5454
#
5555

5656
# The full version, including alpha/beta/rc tags.
57-
release = '1.7.1'
58-
59-
# The short X.Y version.
60-
version = '.'.join(release.split('.')[0:2])
57+
release = get_distribution('django-user-sessions').version
58+
# for example take major/minor
59+
version = '.'.join(release.split('.')[:2])
6160

6261
# The language for content autogenerated by Sphinx. Refer to documentation
6362
# for a list of supported languages.

‎docs/release-notes.rst

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Release Notes
22
=============
33

4+
Unreleased
5+
----------
6+
* New: Support for Django 3.0 and 3.1.
7+
* New: Support for Python 3.9.
8+
* Moved CI to GitHub Actions.
9+
* Dropped Python 3.5 support.
10+
411
1.7.0
512
-----
613
* new: Support for Django 2.2+.

‎setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

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

‎tox.ini

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@
22
; Minimum version of Tox
33
minversion = 1.8
44
envlist =
5-
py{36,37,38,39}-{dj22,dj30,dj31,djmaster},
5+
py{36,37,38,39}-dj{22,30,31,master}
66
flake8
77

8-
[travis]
9-
unignore_outcomes = True
8+
[gh-actions]
9+
python =
10+
3.6: py36
11+
3.7: py37
12+
3.8: py38, flake8
13+
3.9: py39
1014

11-
[travis:env]
15+
[gh-actions:env]
1216
DJANGO =
1317
2.2: dj22
1418
3.0: dj30
1519
3.1: dj31
1620
master: djmaster
1721

1822
[testenv]
19-
commands =
23+
commands =
2024
coverage run {envbindir}/django-admin test -v 2 --pythonpath=./ --settings=tests.settings
2125
coverage report
26+
coverage xml
2227
deps =
2328
coverage
2429
dj22: Django<2.3

‎user_sessions/__init__.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from pkg_resources import get_distribution, DistributionNotFound
2+
3+
try:
4+
__version__ = get_distribution("django-user-sessions").version
5+
except DistributionNotFound:
6+
# package is not installed
7+
__version__ = None

0 commit comments

Comments
 (0)