Merge pull request #21 from djk2/github-actions

GitHub actions
djk2 · Apr 6, 2021 · a9b0a41 · a9b0a41
2 parents 47a09ca + 8452401
commit a9b0a41
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 100 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -0,0 +1,27 @@
+name: UnitTests
+
+on: [push, pull_request]
+
+jobs:
+
+  tests:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 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: Upgrade PIP
+      run: python -m pip install --upgrade pip
+    - name: Install tox
+      run: python -m pip install --upgrade tox
+    - name: Run tests
+      run: |
+        export PYV="py"`echo "${{ matrix.python-version }}" | tr -d '.'`
+        tox -e `tox -l | grep $PYV | tr "\n" ","`
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,17 +1,23 @@
 CHANGELOG
 ===========
 
+v. 2.0.1
+--------
+
+    * Migrate tests from Travis to GitHub Actions + drop tests for Python v2.
+      Stil, tests based on 'tox'.
+
 v. 2.0.0
 --------
 
     * Support for Django 3.1
     * Tests with django-tables2 v2.3
-    * Add support for Bootstrap5
+    * Add support for Bootstrap5 - issue #19
     * Add special classes `ColumnShiftTableBootstrap3`,
       `ColumnShiftTableBootstrap4` and `ColumnShiftTableBootstrap5`
     * Change default inherit for django_tables2_column_shifter/templtes/table.html
       from `django_tables2_column_shifter/bootstrap.html` to `django_tables2_column_shifter/bootstrap4.html`
-      so class `ColumnShiftTable` by default call bootstrap4 template from django-tables2.
+      so class `ColumnShiftTable` by default call bootstrap4 template from django-tables2 - refere to issue #18
       **If you use different bootstrap version then 4 please use one of class: ColumnShiftTableBootstrap2/3/4/5 **
 
 v. 0.5.2

diff --git a/README.rst b/README.rst
@@ -7,9 +7,9 @@ django-tables2-column-shifter
     :alt: Latest PyPI version
 
 
-.. image:: https://travis-ci.org/djk2/django-tables2-column-shifter.svg?branch=master
-    :target: https://travis-ci.org/djk2/django-tables2-column-shifter
-    :alt: Travis CI
+.. image:: https://github.com/djk2/django-tables2-column-shifter/actions/workflows/tests.yaml/badge.svg?branch=master
+    :target: https://github.com/djk2/django-tables2-column-shifter/actions/workflows/tests.yaml
+    :alt: GitHub Actions
 
 
 .. image:: https://requires.io/github/djk2/django-tables2-column-shifter/requirements.svg?branch=master

diff --git a/django_tables2_column_shifter/__init__.py b/django_tables2_column_shifter/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (2, 0, 0)
+VERSION = (2, 0, 1)
 __version__ = ".".join(str(i) for i in VERSION)
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,5 @@
 Django>=3.1
-django-tables2>=2.3.0
+django-tables2>=2.3.4
 tox>=3.23.0
 flake8
 twine

diff --git a/testproject/requirements.txt b/testproject/requirements.txt
@@ -1,3 +1,3 @@
-Django>3.1.*
-django-tables2==2.3.*
+Django>3.1
+django-tables2==2.3.4
 ../.
diff --git a/tox.ini b/tox.ini
@@ -1,16 +1,15 @@
 [tox]
 envlist=
     py38-djmaster-dtmaster-tests,
-    {py38}-dj{3.0,3.1}-dt{2.3,master}-tests,
-    {py36}-dj{2.0,2.1}-dt{1.19,1.21,2.0,2.1,2.2}-tests,
-    {py27,py36}-dj{1.11}-dt{1.19,1.21}-tests,
-    {py27,py36}-dj{1.9,1.10,1.11}-dt{1.15,1.16}-tests,
-    {py27,py36}-{flake},
+    {py36,py38}-dj{3.0,3.1}-dt{2.3,master}-tests,
+    py36-dj{2.0,2.1}-dt{1.19,1.21,2.0,2.1,2.2}-tests,
+    py36-dj{1.11}-dt{1.19,1.21}-tests,
+    py36-dj{1.9,1.10,1.11}-dt{1.15,1.16}-tests,
+    {py38,py36}-{flake},
     py36-isort
 
 [testenv]
 basepython =
-    py27: python2.7
     py36: python3.6
     py38: python3.8