Merge pull request #154 from nir0s/add-license-file

Repo Organization

.travis.yml

@@ -1,18 +1,33 @@
 sudo: false
 language: python
-python: 3.5
-env:
-    - TOXENV=flake8
-    - TOXENV=py26
-    - TOXENV=py27
-    - TOXENV=py34
-    - TOXENV=py35
-    - TOXENV=pypy
-    - TOXENV=pypy3
+
+matrix:
+  include:
+    - env: TOXENV=flake8
+    - env: TOXENV=py3flake8
+    - python: 2.6 # these are just to make travis's UI a bit prettier
+      env: TOXENV=py26
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.3
+      env: TOXENV=py33
+    - python: 3.4
+      env: TOXENV=py34
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+    - python: pypy
+      env: TOXENV=pypy
+    # This should be tested. Problem is, Travis are using Python 3.2 for pypy3 which is no longer supported by pip
+    # - python: pypy3
+    #   env: TOXENV=pypy3
+
+before_install:
+  - pip install codecov
 install:
-    - pip install tox
-    - pip install codecov
+  - pip install tox
 script:
-    - tox
+  - tox
 after_success:
   - codecov

MANIFEST.in

@@ -0,0 +1,10 @@
+include *.md
+include *.py
+include *.txt
+include LICENSE
+include CHANGES
+include Makefile
+
+recursive-include tests *.py
+
+global-exclude *.py[co]

Makefile

@@ -86,8 +86,9 @@ test:
 
 .PHONY: publish
 publish:
-	python setup.py sdist upload
-	@echo "$@ done; uploaded the ld package to PyPI."
+	python setup.py sdist bdist_wheel
+	twine upload -s dist/$(PACKAGENAME)-*
+	@echo "$@ done."
 
 .PHONY: html
 html:

codecov.yml

@@ -3,7 +3,7 @@ coverage:
     status:
         patch:
             default:
-                target: '100'
+                target: '98'
         project:
             default:
-                target: '100'
+                target: '98'

query_local_distro.py

@@ -14,9 +14,11 @@
 # limitations under the License.
 
 from __future__ import print_function
-import distro
+
 from pprint import pformat
 
+import distro
+
 
 def pprint(obj):
     for line in pformat(obj).split('\n'):

setup.cfg

@@ -0,0 +1,5 @@
+[bdist_wheel]
+universal = 1
+
+[metadata]
+license_file = LICENSE

setup.py

@@ -18,7 +18,7 @@
 
 # The following version is parsed by other parts of this package.
 # Don't change the format of the line, or the variable name.
-package_version = "1.0.1"
+package_version = "1.0.2"
 
 here = os.path.abspath(os.path.dirname(__file__))
 

tox.ini

@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Note: Put tox.ini in same directory as setup.py.
-
 [tox]
 minversion = 1.7.2
-envlist = flake8,py26,py27,py34,py35,pypy
+envlist = flake8, py3flake8, py26, py27, py33, py34, py35, py36, pypy, pypy3
 skip_missing_interpreters = true
 
 [testenv]
@@ -25,31 +23,21 @@ deps =
     codecov
 passenv = CI TRAVIS TRAVIS_*
 commands =
-    coverage run --parallel-mode -m nose
-    coverage combine
-    coverage report -m
-
-[testenv:py26]
-basepython = python2.6
-
-[testenv:py27]
-basepython = python2.7
-
-[testenv:py34]
-basepython = python3.4
-
-[testenv:py35]
-basepython = python3.5
+    nosetests --with-cov --cov-report term-missing --cov distro tests -v
 
 [testenv:pywin]
 deps =
     -rdev-requirements.txt
-commands=nosetests --with-cov --cov-report term-missing --cov distro.py tests -v
+commands=nosetests --with-cov --cov-report term-missing --cov distro tests -v
 basepython = {env:PYTHON:}\python.exe
 passenv=ProgramFiles APPVEYOR LOGNAME USER LNAME USERNAME HOME USERPROFILE
 
 [testenv:flake8]
-deps =
-    flake8
-    -rdev-requirements.txt
-commands=flake8 distro.py
+basepython = python2.7
+deps = flake8
+commands = flake8 distro.py
+
+[testenv:py3flake8]
+basepython = python3.5
+deps = flake8
+commands = flake8 distro.py