Merge pull request #5 from nonamenix/change-ci

Use travis ci instead of gitlab

.travis.yml

@@ -0,0 +1,18 @@
+dist: xenial
+language: python
+python:
+- '3.7'
+install:
+- pip install -r requirements-test.txt
+- pip install coveralls
+script:
+- make ci_test
+after_success: coveralls
+deploy:
+  provider: pypi
+  user: nonamenix
+  password:
+    secure: O6fo9lbcnQ6uDIl6Bg4kaGBaQkM100TMpNwy2m/iLcO++4tlGC+4Sma1XqDhYAlruRn0FltfOqO2Ej83MoSLvEQQXomDyzleO1iIKE8iM2bhDLz7zLtckyBs90nFWt8gApDEKL4urHdbPTG1T9uYkmK4h9zWV4U+F9fkK1DJrkYIO4hVhINuMrVl0kUiV792qU9LnMnLbDSKFu8zw/V5Jko3KKIv3as3h2fVx9bOxMDjpBKIodzmnUD2nOv+0MkcllLl3vflWHjyk59ELVaQ2DJDlrPU5ThyzYw+EnQFDL2ost4qK3FpTch60PSJfaIQQRQLSD0saQGU9jhoPV/GaFXAuYb7e+en2llWcI4nH/1FuILKea/xBnpOznLgODuC9gEzR5xSWKLRCaHL8zxEwu62YEipxlUhFlGWfaNCaNjcNdh2BxqUuo9bIydHPJ1Kg22SHUICD52SO0V8wzCYe+tijR3Bn5FFnq+d8cznZM6NrhjbtjDCP+3bwhyIRf2LFqNHcXyJdQjS5GD8VZes9Lsn6wW4PlwqmQtjuEWy/e5C5yKp6DOc2jOo5gy+Nvt2/OVQ6ooxr3rIKQwGXAovyca9j+e4BcTRnUu35gIZSv32QiqbtftETFlFTSrQXqK9K1ezuYuqnS/bqFexwQovUjPG9LRKk7scAAon/MjiuHw=
+  distributions: sdist bdist_wheel
+  on:
+    tags: true

Makefile

@@ -1,13 +1,12 @@
 PROJECT = jam
 
-PYTHON_VERSION = 3.6
+PYTHON_VERSION ?= 3.7
 REQUIREMENTS = requirements.txt
 REQUIREMENTS_TEST = requirements-test.txt
 VIRTUAL_ENV ?= .venv
 PYTHON ?= $(VIRTUAL_ENV)/bin/python
 PIP_CONF = pip.conf
 PYPI = pypi
-TEST_SETTINGS = settings_test
 
 pip_install:
 	pip install -r requirements-test.txt
@@ -18,9 +17,6 @@ ci_test:
 test: venv
 	$(VIRTUAL_ENV)/bin/py.test
 
-test_coverage: venv
-	$(VIRTUAL_ENV)/bin/py.test --cov-report html:.reports/coverage --cov-config .coveragerc --cov-report term:skip-covered --cov $(PROJECT)
-
 venv_init:
 	pip install virtualenv
 	if [ ! -d $(VIRTUAL_ENV) ]; then \

README.rst

@@ -3,14 +3,16 @@ Marshmallow Jam
 
 Some extra sweets for marshmallow.
 
-|version| |pipeline status| |coverage report|
+|version| |pipeline status| |coverage report| |python_version|
 
-.. |pipeline status| image:: https://gitlab.com/nonamenix/marshmallow-jam/badges/master/pipeline.svg
-   :target: https://gitlab.com/nonamenix/marshmallow-jam/commits/master
-.. |coverage report| image:: https://gitlab.com/nonamenix/marshmallow-jam/badges/master/coverage.svg
-   :target: https://gitlab.com/nonamenix/marshmallow-jam/commits/master
+.. |pipeline status| image:: https://img.shields.io/travis/nonamenix/marshmallow-jam.svg
+   :target: https://travis-ci.org/nonamenix/marshmallow-jam
+.. |coverage report| image:: https://coveralls.io/repos/github/nonamenix/marshmallow-jam/badge.svg?branch=master
+   :target: https://coveralls.io/github/nonamenix/marshmallow-jam?branch=master
 .. |version| image:: https://badge.fury.io/py/marshmallow-jam.svg
    :target: https://badge.fury.io/py/marshmallow-jam
+.. |python_version| image:: https://img.shields.io/badge/python-3.7-blue.svg
+   :target: https://docs.python.org/3/whatsnew/3.7.html
 
 Examples
 --------

jam/__init__.py

@@ -115,7 +115,7 @@ def __new__(mcs, name, bases, attrs):
         attrs = {**get_fields_from_annotations(annotations), **attrs}
 
         new_class = super().__new__(mcs, name, bases, attrs)
-        setattr(new_class, "_dataclass", dataclass(type(name, (), attrs)))
+        setattr(new_class, "_dataclass", dataclass(type(name, (), attrs)))  # noqa: B010
         return new_class
 
 

requirements-test.txt

@@ -2,12 +2,11 @@
 
 coverage
 mock
-flake8
-flake8-bugbear
+flake8==3.7.7
+flake8-bugbear==19.3.0
 mccabe
 pycodestyle
-pytest
-pytest-aiohttp
-pytest-cov
-pytest-env
-pytest-flake8
+pytest==4.6.2
+pytest-cov==2.7.1
+pytest-env==0.6.2
+pytest-flake8==1.0.4