Start of v0.4.5: adopting git flow and flake8

Signed-off-by: Sorin Sbarnea <[email protected]>

Author: ssbarnea

.gitignore

@@ -5,3 +5,6 @@ dist
 .tox
 ~*.*
 build/
+.idea/inspectionProfiles/
+.python-version
+.vscode

.idea/.name

@@ -4,11 +4,12 @@ os:
 - linux
 python:
 - '2.7'
-- '3.3'
 - '3.4'
+- '3.5'
 install:
-- pip -q install coveralls six autopep8
-script: 
+- pip -q install -r requirements.txt
+- pip -q install -r requirements-dev.txt
+script:
 - curl --silent -Lo travis_after_all.py https://raw.github.com/pycontribs/travis_after_all/master/travis_after_all.py && travis_wait python setup.py prerelease test
 - export PACKAGE_VERSION=$(python -c "from wstools.version import __version__; print(__version__)")
 after_success:
@@ -40,20 +41,34 @@ after_script:
 branches:
   only:
   - master
+  - develop
 before_deploy:
   - echo "before deploy..."
 deploy:
   - provider: releases
     api_key:
       - secure: "gr9iOcQjdoAyUAim6FWKzJI9MBaJo9XKfGQGu7wdPXUFhg80Rp6GLJsowP+aU94NjXM1UQlVHDAy627WtjBlLH2SvmVEIIr7+UKBopBYuXG5jJ1m3wOZE+4f1Pqe9bqFc1DxgucqE8qF0sC24fIbNM2ToeyYrxrS6RoL2gRrX2I="
-    file: "dist/jira-$PACKAGE_VERSION.tar.gz"
+    file: "dist/wstools-$PACKAGE_VERSION.tar.gz"
     skip_cleanup: true
     on:
+      branch: master
       condition: "$BUILD_LEADER = YES"
+      tags: true
   - provider: pypi
     user: sorin
     password:
       secure: "E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw="
     distributions: "sdist bdist_wheel"
     on:
+      branch: master
+      condition: "$BUILD_LEADER = YES"
+  - provider: pypi
+    server: https://testpypi.python.org/pypi
+    user: sorins
+    password:
+      secure: "E0cjANF7SLBdYrsnWLK8X/xWznqkF0JrP/DVfDazPzUYH6ynFeneyofzNJQPLTLsqe1eKXhuUJ/Sbl+RHFB0ySo/j/7NfYd/9pm8hpUkGCvR09IwtvMLgWKp3k10NWab03o2GOkSJSrLvZofyZBGR40wwu2O9uXPCb2rvucCGbw="
+    distributions: "sdist bdist_wheel"
+    on:
+      branch: develop
+      tags: false
       condition: "$BUILD_LEADER = YES"

.idea/atlassian-ide-plugin.xml

@@ -0,0 +1,67 @@
+all: clean flake8 test pypi docs tag release
+.PHONY: all docs
+
+PACKAGE_NAME=$(shell python setup.py --name)
+PYTHON_VERSION=$(shell python -c "import sys; print('py%s%s' % sys.version_info[0:2])")
+PYTHON_PATH=$(shell which python)
+PLATFORM=$(shell uname -s | awk '{print tolower($0)}')
+DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+PYENV_HOME := $(DIR)/.tox/$(PYTHON_VERSION)-$(PLATFORM)/
+
+clean:
+	find . -name "*.pyc" -delete
+
+package:
+	python setup.py sdist bdist_wheel build_sphinx
+
+install: prepare
+	$(PYENV_HOME)/bin/python setup.py install
+
+uninstall:
+	$(PYENV_HOME)/bin/pip uninstall -y $(PACKAGE_NAME)
+
+venv: $(PYENV_HOME)/bin/activate
+
+# virtual environment depends on requriements files
+$(PYENV_HOME)/bin/activate: requirements*.txt
+	@echo "INFO:	(Re)creating virtual environment..."
+	test -d $(PYENV_HOME)/bin/activate || virtualenv --python=$(PYTHON_PATH) --system-site-packages $(PYENV_HOME)
+	$(PYENV_HOME)/bin/pip install -q -r requirements.txt
+	$(PYENV_HOME)/bin/pip install -q -r requirements-dev.txt
+	touch $(PYENV_HOME)/bin/activate
+
+prepare: venv
+	@echo "INFO:	=== Prearing to run for package:$(PACKAGE_NAME) platform:$(PLATFORM) py:$(PYTHON_VERSION) dir:$(DIR) ==="
+
+testspace:
+	${HOME}/testspace/testspace publish build/results.xml
+
+flake8:
+	$(PYENV_HOME)/bin/python -m flake8
+	$(PYENV_HOME)/bin/python -m flake8 --install-hook 2>/dev/null || true
+
+test: prepare flake8
+	$(PYENV_HOME)/bin/python setup.py test
+
+test-all:
+	# tox should not run inside virtualenv because it does create and use multiple virtualenvs
+	pip install -q tox tox-pyenv
+	python -m tox --skip-missing-interpreters true
+
+pypi:
+	$(PYENV_HOME)/bin/python setup.py check --restructuredtext --strict
+	$(PYENV_HOME)/bin/python setup.py sdist bdist_wheel upload
+
+pypitest:
+	$(PYENV_HOME)/bin/python setup.py check --restructuredtext --strict
+	$(PYENV_HOME)/bin/python setup.py sdist bdist_wheel upload -r pypitest
+
+tag:
+	bumpversion minor
+	git push origin master
+	git push --tags
+
+release:
+	tag
+	pypi
+	web

.idea/encodings.xml

@@ -5,7 +5,7 @@ VERSION=$(python -c "from wstools.version import __version__ ; print __version__
 echo Preparing to release version $VERSION
 
 echo === Chechink that all changes are commited and pushed ===
-git pull -u
+git pull
 
 git diff
 # Disallow unstaged changes in the working tree

.idea/misc.xml

@@ -0,0 +1,9 @@
+autopep8
+coverage
+coveralls
+flake8
+flake8-docstrings>=0.2.8
+flake8-pep257>=1.0.5
+nose
+pytest
+pytest-flake8

.idea/modules.xml

@@ -0,0 +1 @@
+six

.idea/vcs.xml

@@ -15,7 +15,7 @@ upload-dir = docs/build/html
 [pytest]
 norecursedirs = . .svn jira _build tmp* lib/third lib *.egg bin distutils build docs demo
 python_files = *.py
-addopts = -p no:xdist --ignore=setup.py --tb=long -rsxX -v  --maxfail=10 --pep8 tests
+addopts = -p no:xdist --ignore=setup.py --tb=long -rsxX -v --maxfail=10 --flake8 tests
 timeout=60
 # --maxfail=2 -n4
 # -n4              runs up to 4 parallel procs
@@ -25,22 +25,11 @@ timeout=60
 # these are important for distributed testing, to speedup their execution we minimize what we sync
 rsyncdirs = . jira demo docs
 rsyncignore = .hg .git
-pep8ignore = E501 E265 E127 E901 E128 E402
+flake8-max-line-length = 99
+flake8-ignore = D D100 E402
 
-[pep8]
-exclude=build,lib,.tox,third,*.egg,docs,packages
-;filename=
-;select
-ignore=E501,E265,E402
-max-line-length=1024
-count=1
-;format
-;quiet
-;show-pep8
-;show-source
-statistics=1
-;verbose=1
-
-;PEP8_OPTS="--filename=*.py  --exclude=lib --ignore=E501 scripts"
-;pep8 $PEP8_OPTS --show-source --repeat
-;pep8 --statistics -qq $PEP8_OPTS
+[flake8]
+max-line-length=160
+exclude=build
+statistics=yes
+ignore = D,E402

.travis.yml

@@ -37,7 +37,7 @@ def initialize_options(self):
 
         # if we have pytest-cache module we enable the test failures first mode
         try:
-            import pytest_cache
+            import pytest_cache  # noqa
             self.pytest_args.append("--ff")
         except ImportError:
             pass
@@ -47,7 +47,7 @@ def initialize_options(self):
             # when run manually we enable fail fast
             self.pytest_args.append("--maxfail=1")
         try:
-            import coveralls
+            import coveralls  # noqa
             self.pytest_args.append("--cov=%s" % NAME)
             self.pytest_args.extend(["--cov-report", "term"])
             self.pytest_args.extend(["--cov-report", "xml"])
@@ -63,14 +63,14 @@ def finalize_options(self):
     def run_tests(self):
         # before running tests we need to run autopep8
         try:
-            r = subprocess.check_call(
+            subprocess.check_call(
                 "python -m autopep8 -r --in-place wstools/ tests/",
                 shell=True)
         except subprocess.CalledProcessError:
             logging.getLogger().warn('autopep8 is not installed so '
                                      'it will not be run')
         # import here, cause outside the eggs aren't loaded
-        import pytest
+        import pytest  # noqa
         errno = pytest.main(self.pytest_args)
         sys.exit(errno)
 
@@ -98,7 +98,8 @@ def run(self):
         released_version = data['info']['version']
         if released_version == __version__:
             raise RuntimeError(
-                "This version was already released, remove it from PyPi if you want to release it again or increase the version number. http://pypi.python.org/pypi/%s/" % NAME)
+                "This version was already released, remove it from PyPi if you want to release it"
+                " again or increase the version number. http://pypi.python.org/pypi/%s/" % NAME)
         elif released_version > __version__:
             raise RuntimeError("Cannot release a version (%s) smaller than the PyPI current release (%s)." % (
                 __version__, released_version))
@@ -163,8 +164,8 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
     ],
 )

Makefile

@@ -13,9 +13,9 @@
     inspect.currentframe()))[0], ".."))
 if cmd_folder not in sys.path:
     sys.path.insert(0, cmd_folder)
-from wstools.Utility import DOM
-from wstools.WSDLTools import WSDLReader
-from wstools.TimeoutSocket import TimeoutError
+from wstools.Utility import DOM  # noqa E402
+from wstools.WSDLTools import WSDLReader  # noqa E402
+from wstools.TimeoutSocket import TimeoutError  # noqa E402
 try:
     import configparser
 except:
@@ -49,7 +49,7 @@ def setUp(self):
             self.path = nameGenerator.__next__()
         else:
             self.path = nameGenerator.next()
-        #print(self.path)
+        # print(self.path)
         sys.stdout.flush()
 
     def __str__(self):
@@ -67,7 +67,7 @@ def checkWSDLCollection(self, tag_name, component, key='name'):
         nspname = DOM.GetWSDLUri(version)
         for node in DOM.getElements(definition, tag_name, nspname):
             name = DOM.getAttr(node, key)
-            comp = component[name]
+            comp = component[name]  # noqa F841
             self.failUnlessEqual(eval('comp.%s' % key), name)
 
     def checkXSDCollection(self, tag_name, component, node, key='name'):

release.sh

@@ -1,25 +1,20 @@
 [tox]
-minversion = 1.3
-envlist = py27,py34,flake8
+minversion = 2.3.1
+envlist = {py27,py34,py35}-{win,linux,darwin}
+addopts = --ignore=setup.py
+skip_missing_interpreters = true
+tox_pyenv_fallback=True
 
 [testenv]
-deps=
-    nose 
-    coveralls 
-    coverage
-commands=
-    nosetests --with-coverage --cover-package=wstools
-    bash -c "coveralls || true"
-whitelist_externals=bash
-
-[testenv:py27]
-
-[testenv:py33]
+sitepackages=True
+platform =
+       win: windows
+       linux: linux
+       darwin: darwin
 
-[testenv:py34]
-
-[testenv:flake8]
-basepython=python2.7
-deps=flake8
-commands=flake8 wstools/
+deps=
+    -rrequirements.txt
+    -rrequirements-dev.txt
 
+commands=
+    python -m py.test --cov-report xml