Skip to content

Commit

Permalink
Merge pull request #133 from druids/ProjectCleanupFasterChangedFields
Browse files Browse the repository at this point in the history
Complete project cleanup, faster changed fields, fixed changed fields…
  • Loading branch information
matllubos authored Jan 5, 2022
2 parents 7d4c6d5 + 9d932ef commit c37b2a4
Show file tree
Hide file tree
Showing 23 changed files with 706 additions and 647 deletions.
2 changes: 2 additions & 0 deletions .config/flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
max-line-length = 120
47 changes: 47 additions & 0 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Django CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [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: Install Dependencies
run: |
python -m pip install --upgrade pip
cd example
pip install -r requirements.txt
- name: Flake
run: |
flake8 --config .config/flake8 chamber
- name: Run Tests
run: |
coverage run --omit */site-packages/*,*/migrations/*,*/lib/* example/manage.py test test_chamber.tests --settings=dj.settings.settings -v 2
- name: Coveralls
uses: AndreMiras/coveralls-python-action@develop
with:
parallel: true
flag-name: Unit Test

coveralls_finish:
needs: test
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: AndreMiras/coveralls-python-action@develop
with:
parallel-finished: true
3 changes: 1 addition & 2 deletions chamber/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
try:
from django.core.exceptions import ImproperlyConfigured
try:
#from django.db import models # NOQA
from chamber.patch import * # NOQA
except ImproperlyConfigured:
pass
except ImportError as ex:
except ImportError:
pass
1 change: 1 addition & 0 deletions chamber/forms/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
RestrictedFileValidator, AllowedContentTypesByFilenameFileValidator, AllowedContentTypesByContentFileValidator
)


class DecimalField(forms.DecimalField):

def __init__(self, *args, **kwargs):
Expand Down
4 changes: 0 additions & 4 deletions chamber/importers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

from itertools import zip_longest

from django.conf import settings

import pyprind


def simple_count(file):
lines = 0
Expand Down
Loading

0 comments on commit c37b2a4

Please sign in to comment.