Merge remote-tracking branch 'mithro/master' into master

Author: mithro

.travis.yml

@@ -0,0 +1,41 @@
+language: python
+
+jobs:
+  include:
+    - stage: test
+      python: 2.7
+      env: TOXENV=py27
+      name: "Python 2.7"
+    - python: 3.4
+      env: TOXENV=py34
+      name: "Python 3.4"
+    - python: 3.5
+      env: TOXENV=py35
+      name: "Python 3.5"
+    - python: 3.6
+      env: TOXENV=py36
+      name: "Python 3.6"
+    - stage: deploy
+      python: 3.6
+      name: "Upload dev version to PyPi"
+      script: ./.push-to-pypi.sh
+
+stages:
+  - test
+  - name: deploy
+    if: branch = master
+
+install:
+ - git fetch --tags
+ - cd programmer
+ - pip install --upgrade tox
+ - pip install --upgrade setuptools_scm
+
+script:
+ - tox
+
+notifications:
+  email: false
+
+git:
+  depth: false

programmer/.coveragerc

@@ -1,6 +1,6 @@
 [paths]
 source =
-	tinyfpgab/
+	tinyprog/
 
 [run]
 branch = True

programmer/.gitignore

@@ -1,10 +1,16 @@
-.cache
-.coverage
+# general things to ignore
+htmlcov/
+build/
+dist/
+*egg*
+*.py[cod]
+__pycache__/
+*.so
+*~
+tinyprog/full_version.py
+
+# due to using tox and pytest
 .tox
+.coverage
 .pytest_cache
-*.pyc
-__pycache__
-htmlcov
-build
-dist
-*.egg-info
+.cache

programmer/.push-to-pypi.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+if [ -z "$PYPI_USERNAME" ]; then
+	echo "\$PYPI_USERNAME not set."
+	echo "Not uploading to PyPi."
+	exit 0
+fi
+
+if [ -z "$PYPI_PASSWORD" ]; then
+	echo "\$PYPI_PASSWORD not set."
+	echo "Not uploading to PyPi."
+	exit 0
+fi
+
+if [ "$TRAVIS_BRANCH" != "master" ]; then
+	echo "Not on 'master' branch (on $TRAVIS_BRANCH)."
+	echo "Not uploading to PyPi."
+	exit 0
+fi
+
+set -x
+set -e
+
+if [ ! -e ~/.pypirc ]; then
+	cat > ~/.pypirc <<EOF
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:$PYPI_USERNAME
+password:$PYPI_PASSWORD
+EOF
+
+fi
+
+export SETUPTOOLS_SCM_PRETEND_VERSION="$(python setup.py --version | sed -e's/+.*$//')"
+echo "SETUPTOOLS_SCM_PRETEND_VERSION='$SETUPTOOLS_SCM_PRETEND_VERSION'"
+
+python setup.py --version
+python setup.py check -m -s
+python setup.py install
+tinyprog --help
+tinyprog --version
+
+python setup.py sdist
+python setup.py bdist_wheel --universal
+
+pip install twine
+twine upload dist/*