Skip to content

Commit

Permalink
[qa] Skip migration checks
Browse files Browse the repository at this point in the history
Solved travis build errors
  • Loading branch information
nemesifier authored and devkapilbansal committed Aug 27, 2020
1 parent 0d9b46e commit bafa0a9
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 24 deletions.
1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

7 changes: 5 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -694,9 +694,12 @@ Running QA-checks

You can run qa-checks by using

```./run-qa-checks```
.. code-block:: shell
In docker testing, QA checks are runned automatically.
./run-qa-checks
In docker testing, QA checks are executed automatically.

Contributing
------------
Expand Down
2 changes: 1 addition & 1 deletion run-qa-checks
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
set -e

openwisp-qa-check --migration-path "./tests/django_restframework_gis_tests/migrations/"
openwisp-qa-check --skip-checkmigrations --skip-checkmakemigrations
9 changes: 1 addition & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
universal=1

[flake8]
exclude = *.egg-info,
.git,
*migrations*,
./tests/*settings*.py,
exclude = ./tests/*settings*.py,
docs/*
max-line-length = 110
# W503: line break before or after operator
Expand All @@ -14,10 +11,6 @@ max-line-length = 110
ignore = W605, W503, W504

[isort]
known_third_party = django
known_first_party = rest_framework_gis
default_section = THIRDPARTY
skip = migrations
multi_line_output=3
use_parentheses=True
include_trailing_comma=True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Migration(migrations.Migration):
django.contrib.gis.db.models.fields.PolygonField(srid=4326),
),
],
options={'abstract': False,},
options={'abstract': False},
),
migrations.CreateModel(
name='LocatedFile',
Expand All @@ -63,7 +63,7 @@ class Migration(migrations.Migration):
models.FileField(blank=True, null=True, upload_to='located_files'),
),
],
options={'abstract': False,},
options={'abstract': False},
),
migrations.CreateModel(
name='Location',
Expand All @@ -85,6 +85,6 @@ class Migration(migrations.Migration):
django.contrib.gis.db.models.fields.GeometryField(srid=4326),
),
],
options={'abstract': False,},
options={'abstract': False},
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ class Migration(migrations.Migration):
),
),
],
options={'abstract': False,},
options={'abstract': False},
),
]
24 changes: 16 additions & 8 deletions tests/django_restframework_gis_tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,24 @@ class TestRestFrameworkGis(TestCase):
def setUp(self):
self.location_list_url = reverse('api_location_list')
self.geojson_location_list_url = reverse('api_geojson_location_list')
self.geos_error_message = 'Invalid format: string or unicode input unrecognized as GeoJSON,\
WKT EWKT or HEXEWKB.'
self.gdal_error_message = 'Unable to convert to python object: \
Invalid geometry pointer returned from "OGR_G_CreateGeometryFromJson".'
self.geos_error_message = (
'Invalid format: string or unicode input unrecognized as GeoJSON,'
' WKT EWKT or HEXEWKB.'
)
self.gdal_error_message = (
'Unable to convert to python object:'
' Invalid geometry pointer returned from "OGR_G_CreateGeometryFromJson".'
)
if django.VERSION >= (2, 0, 0):
self.value_error_message = "Unable to convert to python object: \
String input unrecognized as WKT EWKT, and HEXEWKB."
self.value_error_message = (
"Unable to convert to python object:"
" String input unrecognized as WKT EWKT, and HEXEWKB."
)
else:
self.value_error_message = "Unable to convert to python object: \
String or unicode input unrecognized as WKT EWKT, and HEXEWKB."
self.value_error_message = (
"Unable to convert to python object:"
" String or unicode input unrecognized as WKT EWKT, and HEXEWKB."
)
self.type_error_message = (
"Unable to convert to python object: Improper geometry input type:"
)
Expand Down

0 comments on commit bafa0a9

Please sign in to comment.