Merge pull request #10 from akb89/develop

Develop

.gitlab-ci.yml

@@ -21,44 +21,44 @@ build:python3.7:
 test:python3.5:
  image: python:3.5
  stage: test
- script: pip install pytest==3.7.4 pytest-cov==2.6.0 && python -m pytest --cov=pyfn tests/
+ script: pip install pytest pytest-cov && python -m pytest --cov=pyfn tests/
 
 test:python3.6:
  image: python:3.6
  stage: test
- script: pip install pytest==3.7.4 pytest-cov==2.6.0 && python -m pytest --cov=pyfn tests/
+ script: pip install pytest pytest-cov && python -m pytest --cov=pyfn tests/
 
 test:python3.7:
  image: python:3.7
  stage: test
- script: pip install pytest==3.7.4 pytest-cov==2.6.0 && python -m pytest --cov=pyfn tests/
+ script: pip install pytest pytest-cov && python -m pytest --cov=pyfn tests/
 
 lint:python3.5:
  image: python:3.5
  stage: lint
- script: pip install pylint==2.1.1 && pylint pyfn
+ script: pip install pylint && pylint pyfn
 
 lint:python3.6:
  image: python:3.6
  stage: lint
- script: pip install pylint==2.1.1 && pylint pyfn
+ script: pip install pylint && pylint pyfn
 
 lint:python3.7:
  image: python:3.7
  stage: lint
- script: pip install pylint==2.1.1 && pylint pyfn
+ script: pip install pylint && pylint pyfn
 
 docstyle:python3.5:
  image: python:3.5
  stage: lint
- script: pip install pydocstyle==2.1.1 && pydocstyle pyfn
+ script: pip install pydocstyle && pydocstyle pyfn
 
 docstyle:python3.6:
  image: python:3.6
  stage: lint
- script: pip install pydocstyle==2.1.1 && pydocstyle pyfn
+ script: pip install pydocstyle && pydocstyle pyfn
 
 docstyle:python3.7:
  image: python:3.7
  stage: lint
- script: pip install pydocstyle==2.1.1 && pydocstyle pyfn
+ script: pip install pydocstyle && pydocstyle pyfn

.travis.yml

@@ -0,0 +1,23 @@
+language: python
+python:
+  - "3.5"
+  - "3.6"
+
+# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
+
+install:
+  - python setup.py -q install
+  - pip install pylint pydocstyle pytest pytest-cov coveralls
+
+script:
+  - python -m pytest --cov=pyfn tests/
+  - pylint pyfn
+  - pydocstyle pyfn
+
+after_success:
+  - coveralls

README.md

@@ -1,8 +1,7 @@
 # pyfn
 [![GitHub release][release-image]][release-url]
 [![PyPI release][pypi-image]][pypi-url]
-[![Build][build-image]][build-url]
-[![Requirements Status][req-image]][req-url]
+[![Build][travis-image]][travis-url]
 [![Code Coverage][coverage-image]][coverage-url]
 [![FrameNet][framenet-image]][framenet-url]
 [![MIT License][license-image]][license-url]
@@ -736,8 +735,8 @@ If you use `pyfn` please cite:
 [release-url]:https://github.com/akb89/pyfn/releases/latest
 [pypi-image]:https://img.shields.io/pypi/v/pyfn.svg?style=flat-square
 [pypi-url]:https://pypi.org/project/pyfn/
-[build-image]:https://gitlab.com/akb89/pyfn/badges/master/pipeline.svg
-[build-url]:https://gitlab.com/akb89/pyfn/commits/master
+[travis-image]:https://img.shields.io/travis/akb89/pyfn.svg?style=flat-square
+[travis-url]:https://travis-ci.org/akb89/pyfn
 [coverage-image]:https://img.shields.io/coveralls/akb89/pyfn/master.svg?style=flat-square
 [coverage-url]:https://coveralls.io/github/akb89/pyfn?branch=master
 [framenet-image]:https://img.shields.io/badge/framenet-1.5%E2%87%A1-blue.svg?style=flat-square

setup.py

@@ -16,7 +16,7 @@
     author_email='[email protected]',
     long_description=long_description,
     long_description_content_type='text/markdown',
-    version='1.2.2',
+    version='1.2.3',
     url='https://gitlab.com/akb89/pyfn',
     download_url='https://pypi.org/project/pyfn/#files',
     license='MIT',