Skip to content

Commit

Permalink
Merge pull request #474 from jazzband/gha
Browse files Browse the repository at this point in the history
Migrate to GitHub Actions.
  • Loading branch information
jezdez committed Nov 25, 2020
2 parents c59a19f + d76590d commit acc36d9
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 56 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Release

on:
push:
tags:
- '*'

jobs:
build:
if: github.repository == 'jazzband/django-admin2'
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: 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: release-${{ hashFiles('**/setup.py') }}
restore-keys: |
release-
- 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-admin2/upload
47 changes: 47 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
strategy:
max-parallel: 5
matrix:
python-version: [3.5, 3.6, 3.7, 3.8]

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
- name: Upload coverage
uses: codecov/codecov-action@v1
with:
name: Python ${{ matrix.python-version }}
39 changes: 0 additions & 39 deletions .travis.yml

This file was deleted.

13 changes: 5 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@ django-admin2
.. image:: https://jazzband.co/static/img/badge.svg
:target: https://jazzband.co/
:alt: Jazzband
.. image:: https://travis-ci.org/jazzband/django-admin2.png
:alt: Build Status
:target: https://travis-ci.org/jazzband/django-admin2
.. image:: https://coveralls.io/repos/github/jazzband/django-admin2/badge.svg?branch=develop
:alt: Coverage Status
:target: https://coveralls.io/github/jazzband/django-admin2?branch=develop
.. image:: https://badges.gitter.im/Join Chat.svg
:target: https://gitter.im/pydanny/django-admin2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
.. image:: https://github.com/jazzband/django-admin2/workflows/Test/badge.svg
:target: https://github.com/jazzband/django-admin2/actions
:alt: GitHub Actions
.. image:: https://codecov.io/gh/jazzband/django-admin2/branch/develop/graph/badge.svg?token=PcC594rhI4
:target: https://codecov.io/gh/jazzband/django-admin2

One of the most useful parts of ``django.contrib.admin`` is the ability to
configure various views that touch and alter data. django-admin2 is a complete
Expand Down
6 changes: 3 additions & 3 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Pull upstream changes into your fork regularly

To pull in upstream changes::

git remote add upstream https://github.com/twoscoops/django-admin2.git
git remote add upstream https://github.com/jazzband/django-admin2.git
git pull upstream develop

For more info, see http://help.github.com/fork-a-repo/
Expand Down Expand Up @@ -284,6 +284,6 @@ We finish with a merge and push to GitHub::
git push origin develop

.. _installation: install.html
.. _GitHub project: https://github.com/twoscoops/django-admin2
.. _issue tracker: https://github.com/twoscoops/django-admin2/issues
.. _GitHub project: https://github.com/jazzband/django-admin2
.. _issue tracker: https://github.com/jazzband/django-admin2/issues
.. _pydanny: http://pydanny.com
6 changes: 3 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Welcome to django-admin2's documentation!
=========================================

.. image:: https://travis-ci.org/jazzband/django-admin2.png
:alt: Build Status
:target: https://travis-ci.org/jazzband/django-admin2
.. image:: https://github.com/jazzband/django-admin2/workflows/Test/badge.svg
:target: https://github.com/jazzband/django-admin2/actions
:alt: GitHub Actions

**Warning:** This project is currently in an **alpha** state and currently not meant for real projects.

Expand Down
3 changes: 2 additions & 1 deletion requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
-rrequirements.txt
flake8>=2.5.4
pytest
pytest-django
pytest-django
pytest-cov
10 changes: 8 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,21 @@ exclude = migrations/*,docs/*

[tox]
envlist =
py35-{2.2,3.0},
py35-{2.2},
py36-{2.2,3.0,3.1},
py37-{2.2,3.0,3.1,master},
py38-{2.2,3.0,3.1,master},

[gh-actions]
python =
3.5: py35
3.6: py36
3.7: py37
3.8: py38

[testenv]
commands =
py.test []
pytest --cov-append --cov djadmin2 --cov-report=xml []
deps =
-rrequirements_test.txt
3.1: Django>=3.1,<3.2
Expand Down

0 comments on commit acc36d9

Please sign in to comment.