Merge pull request AltSchool#303 from AltSchool/drop-py2

Drop support for py2 and move to Github Actions

Author: suavesav

.circleci/config.yml

@@ -6,59 +6,15 @@ jobs:
     parallelism: 1
 
     docker:
-      - image: circleci/python:2.7.16-stretch
+      - image: circleci/python:3.6.9
     steps:
       - checkout
-      - run:
-          name: Update PATH variable
-          command: echo 'export PATH="${HOME}/.local/bin:${PATH}"' >> ${BASH_ENV}
-      - run:
-          name: Install python3-devel
-          command: sudo apt-get install python3-dev
       - run:
           name: Install from requirements.txt
           command: pip install --user --exists-action w -r requirements.txt
       - run:
           name: Run Setup
           command: python setup.py develop --user
-      - run:
-          name: Install pyenv
-          command: |
-            curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
-            sudo ln -s $HOME/.pyenv/bin/pyenv /usr/local/bin/pyenv && eval "$(pyenv init -)"
-            eval "$(pyenv virtualenv-init -)"
-      - restore_cache:
-          name: Restore PyEnv Cache
-          keys:
-              - v1.1-pyenv-cache-{{ checksum ".circleci/python-versions.txt" }}
-      - run:
-          name: Install python versions for testing
-          command: |
-            echo "PyEnv Versions already installed:"
-            pyenv versions
-            python_versions=$(cat .circleci/python-versions.txt)
-            echo "Python versions to install: $python_versions"
-            for python_version in $python_versions; do
-                echo "INSTALLING: Python $python_version"
-                pyenv install -s $python_version
-            done
-            pyenv local  $python_versions
-      - save_cache:
-          name: Save PyEnv Cache
-          key: v1.1-pyenv-cache-{{ checksum ".circleci/python-versions.txt"}}
-          paths:
-              - "~/.pyenv"
-
       - run:
           name: Run Integration tests
           command: ENABLE_INTEGRATION_TESTS=True py.test tests/integration
-      - run:
-          name: Run Tox Tests
-          command: tox --parallel=4 -q
-
-workflows:
-  version: 2
-  build-and-test:
-    jobs:
-      - build:
-          context: org-global

.github/workflows/test.yml

@@ -0,0 +1,54 @@
+name: Test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.5, 3.6, 3.7]
+        dj-version: ["1.11.*", "2.0.*", "2.1.*", "2.2.*"]
+        drf-version: ["3.8.*", "3.9.*", "3.10.*", "3.11.*"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install 'django==${{ matrix.dj-version }}' 'djangorestframework==${{ matrix.drf-version }}'
+
+    - name: Run Tests
+      run: |
+        ./runtests.py --fast --coverage -rw
+
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python37
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+
+    - name: Install Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8==2.4.0
+
+    - name: Lint Code
+      run: |
+        flake8 dynamic_rest tests

README.md

@@ -57,14 +57,15 @@ but it can be used to provide fast and flexible CRUD operations to any consumer
 
 ## Maintainers
 
-* [Anthony Leontiev](mailto:[email protected])
-* [Ryo Chijiiwa](mailto:[email protected])
+* [Anthony Leontiev](mailto:[email protected])
+* [Ryo Chijiiwa](mailto:[email protected])
+* [Savinay Nangalia](mailto:[email protected])
 
 # Requirements
 
-* Python (2.7, 3.4, 3.5, 3.6)
-* Django (1.8, 1.9, 1.10, 1.11, 2.0, 2.1)
-* Django REST Framework (3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9)
+* Python (3.5, 3.6, 3.7)
+* Django (1.11, 2.0, 2.1, 2.2)
+* Django REST Framework (3.8, 3.9, 3.10, 3.11)
 
 # Installation
 

install_requires.txt

@@ -1,5 +1,4 @@
-Django>=1.8,<2.0
-djangorestframework>=3.1.0,<3.10
+Django>=1.11,<3.0.0
+djangorestframework>=3.8.0,<3.12.0
 inflection==0.3.1
 requests
-pytz

install_requires_python3.txt

@@ -1,12 +1,12 @@
-Sphinx==1.6.5
-dj-database-url==0.4.2
-flake8==2.4.0
+dj-database-url==0.5.0
+djay>=0.0.8
+flake8==3.5.0
 mock==2.0.0
+psycopg2==2.7.5
 pytest-cov==2.5.1
-pytest-django==3.1.2
-pytest-sugar==0.9.0
-pytest==3.2.5  # last supported version python 2
-psycopg2==2.7.3.2
+pytest-django==3.4.1
+pytest-sugar==0.9.1
+pytest==3.7.1
+Sphinx==1.7.5
 tox-pyenv==1.1.0
 tox==3.14.6
-djay==0.0.8

requirements.test.txt

@@ -1,18 +1,15 @@
-import sys
 from setuptools import find_packages, setup
 
 NAME = 'dynamic-rest'
 DESCRIPTION = 'Adds Dynamic API support to Django REST Framework.'
 URL = 'http://github.com/AltSchool/dynamic-rest'
-VERSION = '1.9.7'
+VERSION = '1.9.8'
 SCRIPTS = ['manage.py']
 
 setup(
     description=DESCRIPTION,
     include_package_data=True,
-    install_requires=open('install_requires.txt'
-                          if sys.version_info.major == 2
-                          else 'install_requires_python3.txt').readlines(),
+    install_requires=open('install_requires.txt').readlines(),
     long_description=open('README.rst').read(),
     name=NAME,
     packages=find_packages(),
@@ -24,8 +21,6 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

requirements.txt

@@ -1,11 +1,15 @@
 from unittest import TestCase, skipIf
-from dj.test import TemporaryApplication
 from django.conf import settings
 import requests
 import time
 import json
 import os
 
+try:
+    from djay.test import TemporaryApplication
+except ImportError:
+    from dj.test import TemporaryApplication
+
 
 class DJBlueprintsTestCase(TestCase):
 
@@ -14,8 +18,16 @@ class DJBlueprintsTestCase(TestCase):
         'Integration tests disabled'
     )
     def test_blueprints(self):
+        params = {
+            "app": "dummy",
+            "description": "dummy",
+            "author": "dummy",
+            "email": "[email protected]",
+            "version": "0.0.1",
+            "django_version": "2.2",
+        }
         # generate a test application
-        application = TemporaryApplication()
+        application = TemporaryApplication(params=params)
         # add a model
         application.execute('generate model foo --not-interactive')
         # create and apply migrations

setup.py

@@ -3,11 +3,8 @@ addopts=--tb=short
 
 [tox]
 envlist =
-       py27-lint,
        py37-lint,
-       {py27,py35,py36,py37}-django111-drf{37,38,39},
-       {py35}-django{20,21,22}-drf{37,38,39,310,311},
-       {py36,py37}-django{20,21,22}-drf{38,39,310,311},
+       {py35,py36,py37}-django{111,20,21,22}-drf{38,39,310,311},
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage -rw
@@ -18,30 +15,17 @@ deps =
         django20: Django==2.0.13
         django21: Django==2.1.15
         django22: Django==2.2.12
-        drf37: djangorestframework==3.7.7
         drf38: djangorestframework==3.8.2
         drf39: djangorestframework==3.9.4
         drf310: djangorestframework==3.10.3
         drf311: djangorestframework==3.11.0
-        -rrequirements.test.txt
-
-[testenv:py27-lint]
-commands = ./runtests.py --lintonly
-deps =
         -rrequirements.txt
 
 [testenv:py37-lint]
 commands = ./runtests.py --lintonly
 deps =
         -rrequirements.txt
 
-[testenv:py27-drf39-benchmarks]
-commands = ./runtests.py --benchmarks
-deps =
-        Django==1.11.29
-        djangorestframework==3.9.4
-        -rrequirements.benchmark.txt
-
 [testenv:py37-drf311-benchmarks]
 commands = ./runtests.py --benchmarks
 deps =