Merge pull request #151 from c-martinez/master

Automatically deploy tagged releases

Author: albertmeronyo

.travis.yml

@@ -1,25 +1,46 @@
-cache:
-  directories:
-  - "$HOME/.cache/pip"
-  - "$HOME/.pyenv"
+sudo: false
+language: python
+cache: pip
+python: 3.5
 
-matrix:
-  include:
-  - os: linux
-    python: '2.7'
-  - os: linux
-    python: '3.6'
-  - os: osx
-    language: objective-c
-    env: PYENV_VERSION=2.7.12
-  - os: osx
-    language: objective-c
-    env: PYENV_VERSION=3.5.2
-# command to install dependencies
 before_install:
   - source .travis/before_install.sh
 install:
   - source .travis/install.sh
 # command to run tests
 script:
   - source .travis/run.sh
+
+jobs:
+  include:
+    - stage: Tests
+      os: linux
+      python: '2.7'
+    - stage: Tests
+      os: linux
+      python: '3.6'
+    - stage: Tests
+      os: osx
+      language: objective-c
+      env: PYENV_VERSION=2.7.12
+    - stage: Tests
+      os: osx
+      language: objective-c
+      env: PYENV_VERSION=3.5.2
+      # command to install dependencies
+    - stage: deploy
+      # deploy automatically to pypi
+      before_deploy:
+        - source .travis/before_deploy.sh
+      script: skip
+      # deploy automatically to pypi
+      deploy:
+        provider: pypi
+        server: https://pypi.org/legacy/
+        user: nlesc
+        distributions: sdist bdist_wheel
+        password:
+          secure: IDakMHNli6Ir+GFzCOxcxBc4c/UdP6il9ICzuiAvzxRa5+k2uxUtPwdXVXTq7dOrLSi4lNO3m16ipnJiDxVpM6BbnsLzbQgeGoHFdOUsNMSldt1A9syag+rplNtfyHoqwBb+ogwGDyZ1bjZMllnJfNoUFPJe2TwIQlQ+aHNiVwUEIHWZQBH+AfRNu+eeTArOu3Ln/E8IY8NJazt8UUF+Rwhl45GWGIRWCL6cV0YVdYpikUdAs+Ier+UO6wvRQ+G9/qik26+w2cXeej6HwSk4vl0DKhsxj6POYMwHeGc2wGMlJPn9hCgcBMU3Hgh4+CGXVQ36SiY3XCClUws9MAyrrbIXVGwt1QuuStjqQH77+kABGlGpnz0hfN+J8hLvzdF95316+eRezQ/5kilNqRAPb8+hbANqrev17N8bAQ+gQDBGjqZ2B6cr15YogvJHtunWkiuP44FJeQweTAiOjl/LHmWxc2b6o0Fs3ZYltWUHI4QTK01YIM73zp4dkr6gzfrGBH22Ut0zDpMTqGN+M8gxs/q8pRwvvd7XkuLSaWxrnS07W0rLsRaJHjbaclh1NifuNS3dNEgVxI8vNNKJUYNUELsk9RxCkn+CyBk5AzJa52PrPeCHcHD8YJAV2aT0etndyZvnnSRB7SqulItoZR1sE9JFe1srQ6etl4y+c6IBsbw=
+        on:
+          tags: true
+          branch: master

.travis/before_deploy.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Deactivate testing virtualenv and reactivate original one
+deactivate
+echo "Reactivating virtualenv:"
+echo $ORIG_ENV
+source $ORIG_ENV

.travis/before_install.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Store location of original virtualenv so we can reactivate it later
+ORIG_ENV="$(dirname $(which python))/activate"
+echo "Original virtualenv"
+echo $ORIG_ENV
+
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
   brew install pyenv
   pyenv install -s $PYENV_VERSION

CITATION.cff

@@ -24,5 +24,4 @@ license: MIT
 message: "If you use this software, please cite it as below."
 repository-code: "https://github.com/CLARIAH/grlc"
 title: grlc
-version: "1.1"
-
+version: "1.2.0"

MANIFEST.in

@@ -1 +1,2 @@
-include requirements.txt
+include requirements.txt
+include requirements-test.txt

requirements.txt

@@ -6,7 +6,6 @@ gunicorn==19.6.0
 html5lib==0.9999999
 isodate==0.5.4
 itsdangerous==0.24
-Jinja2==2.8
 keepalive==0.5
 MarkupSafe==0.23
 pyaml==15.8.2
@@ -18,5 +17,4 @@ requests==2.11.1
 six==1.10.0
 SPARQLWrapper==1.8.2
 Werkzeug==0.14.1
-wheel==0.24.0
 PyGithub==1.35

setup.py

@@ -1,26 +1,44 @@
 #!/usr/bin/env python
 # -*- coding: iso-8859-15 -*-
 
-from distutils.core import setup
+import codecs
 import os
-
-with open('requirements.txt') as f:
-    required = f.read().splitlines()
+from setuptools import setup
 
 grlc_base = 'src/'
 grlc_data = [ root.replace(grlc_base, '') + '/*' for root,dirs,files in os.walk(grlc_base) if root !=grlc_base ]
-grlc_version = '1.0'
+grlc_version = '1.2.0'
+
+with codecs.open('requirements.txt', mode='r') as f:
+    install_requires = f.read().splitlines()
+
+with codecs.open('requirements-test.txt', mode='r') as f:
+    tests_require = f.read().splitlines()
+
+with codecs.open('README.md', mode='r') as f:
+    long_description = f.read()
 
-setup(name='grlc',
-      version=grlc_version,
-      description='grlc, the git repository linked data API constructor',
-      author='Albert Meroño',
-      author_email='albert.merono@vu.nl',
-      url='https://github.com/CLARIAH/grlc',
-      download_url='https://github.com/CLARIAH/grlc/tarball/' + grlc_version,
-      packages=['grlc'],
-      package_dir = {'grlc': 'src'},
-      package_data = {'grlc': grlc_data},
-      scripts=['bin/grlc-server'],
-      install_requires=required
-     )
+setup(
+    name="grlc",
+    description='grlc, the git repository linked data API constructor',
+    long_description=long_description,
+    license="Copyright 2017 Albert Meroño",
+    author='Albert Meroño',
+    author_email='albert.merono@vu.nl',
+    url='https://github.com/CLARIAH/grlc',
+    version=grlc_version,
+    py_modules=['grlc'],
+    packages=['grlc'],
+    package_dir = {'grlc': grlc_base},
+    scripts=['bin/grlc-server'],
+    install_requires=install_requires,
+    setup_requires=[
+        # dependency for `python setup.py test`
+        'pytest-runner',
+        # dependencies for `python setup.py build_sphinx`
+        'sphinx',
+        'recommonmark'
+    ],
+    tests_require=tests_require,
+    package_data = {'grlc': grlc_data},
+)