Merge pull request #1 from cfhamlet/develop

Trivial Update

Author: cfhamlet

.coveragerc

@@ -7,3 +7,4 @@ source = os_urlpattern
 source =
     src/os_urlpattern
     .tox/*/lib/python*/site-packages/os_urlpattern
+    .tox/*/site-packages/os_urlpattern

.travis.yml

@@ -3,25 +3,22 @@ sudo: false
 matrix:
   include:
     - python: 2.7
-      env: TOXENV=py27
+      env: TOXENV=py27,codecov
     - python: 3.6
-      env: TOXENV=py36
+      env: TOXENV=py36,codecov
     - python: pypy
       env: TOXENV=pypy
     - python: pypy3
       env: TOXENV=pypy3
-    - env: TOXENV=coverage
 install:
-- pip install -U pip tox codecov
+- pip install -U pip tox
 script:
 - tox
-after_success:
-- codecov
 deploy:
   provider: pypi
   user: cfhamlet
   password:
     secure: eGq3kLUT6D3grZ2ZlCaJ5e/9Ma3HkOLZQDDcMsWUs/zUqpngI/9ibplgbOcxpRxKCgFKn5GFDV9ZsKk00fEfYWpe4WZW2vG6mu3k63oB4FMkUQ4GGoQKcXdR27aNtNhvTzU3VPDgyEpNI5QJmTLJp3Y3fbzcjL3a87kschf6B46MP4Nu3NqWuXZDYIZN6GY8HwD6J3Ii15nl4rCS6phdYdKckyVX8coNQVWkljx+ZtfGMkClsui9BynKBNVwufm3/F1zwWI1UXCrU3v4FxqiCmK2CYSX7tdFcGHaVTf0NqscbPxZgPvM+1tUBbW1M5N5GlUf5f7CxwtFWEqFTlz926gzYrHUaewmjILWDm6OxWAKjuks8lgywQq2twYpd8UVlRywvjfaobGpptoBevuxgr/uzipeckWR0X1SiqUaFnKzuLOnVeZ9I1ixA5zcIR74xnjEOvBnMpeawzZsIidoQcn4PRzbyaR4uDxnYyWB5yW/Q9d1UbAYOe0QyQY6NnZzvkRovkge3H/Wlk+K2P0qSUmmznWSDekdBcm4yr3bZsujgWOKS3c9L/OHH+P3YVAC1x0304xGveWt0cU/sfTPpEi99N+0QOxPQX3CnutFkXZIgR4nsGWnZYnMngrr8eHIfav+Ms20UTYwjsn79vfXc10kkesQtW863GdFXBYfw3c=
   on:
     tags: true
-    condition: ${TOXENV} == py27
+    condition: ${TRAVIS_PYTHON_VERSION} == 2.7

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 cfhamlet
+Copyright (c) 2017 Ozzy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,7 +1,7 @@
 include LICENSE
 include README.rst
 include MANIFEST.in
-include src/os_urlpattern/VERSION
-include src/os_urlpattern/config/default_config.cfg
-recursive-include tests *.py
-
+graft src
+graft tests
+global-exclude __pycache__
+global-exclude *.py[co]

README.rst

@@ -81,7 +81,7 @@ Character space
 Consider `RFC 3986 (Section 2: Characters) <https://tools.ietf.org/html/rfc3986#section-2>`_,
 URL with the following characters would be legal:
 
-``ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=``
+``ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=%<>\"{}^|``
 
 There are three major character space: lower-case letters(a-z), upper-case letters(A-Z), 
 number letters(0-9). Other symbols are in their own character space.
@@ -178,7 +178,7 @@ Install extra packages
     - ``pip install os-urlpattern[memroy]``
     - Show memory useage
   * - ete-tree
-    - ``pip install os-urlpattern[ete_tree]``
+    - ``pip install os-urlpattern[ete-tree]``
     - Enable `ete <https://github.com/etetoolkit/ete>`_ pattern tree formatter
 
 ========
@@ -249,7 +249,7 @@ Command line
                             log level (default: NOTSET)
       -p PATTERN_FILES [PATTERN_FILES ...], --pattern-files PATTERN_FILES [PATTERN_FILES ...]
                             pattern files to be loaded
-      -a, --all_matched     all matched patterns
+      -a, --all-matched     all matched patterns
 
 
   Match URLs:

setup.py

@@ -32,7 +32,10 @@ def read(*filenames, **kwargs):
             'pattern-match = os_urlpattern.cmdline:match',
         ]
     },
-    extras_require={'memory': ['psutil'], 'ete_tree': ['six', 'ete3']},
+    extras_require={
+        'memory': ['psutil'],
+        'ete-tree': ['six', 'ete3']
+    },
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',

src/os_urlpattern/VERSION

@@ -1 +1 @@
-0.1.10.1
+0.1.11

src/os_urlpattern/cmdline.py

@@ -171,7 +171,7 @@ def add_argument(self, parser):
                             required=True,
                             dest='pattern_files')
 
-        parser.add_argument('-a', '--all_matched',
+        parser.add_argument('-a', '--all-matched',
                             help='all matched patterns',
                             default=False,
                             action='store_true',

src/os_urlpattern/pattern_cluster.py

@@ -1,4 +1,4 @@
-"""Cluster algrithm.
+"""Cluster algorithm.
 """
 from __future__ import unicode_literals
 

tox.ini

@@ -4,25 +4,36 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py36, pypy, pypy3, coverage
+envlist = py{27,36,py,py3}, coverage-report
 
-[testenv]
-commands =
-    pytest {posargs}
+[base]
 deps = 
-    pytest >= 2.10
-    six
-    ete3
+    pytest > 2.10
+    coverage
+    pytest-env
 
-[testenv:coverage]
+[testenv]
 commands = 
-    coverage erase
     coverage run -m pytest {posargs}
-    coverage combine
-    coverage report
+
 deps = 
-    coverage
-    pytest >= 2.10
-    pytest-env
+    {[base]deps}
     six
     ete3
+
+[testenv:coverage-report]
+deps = coverage
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+
+[testenv:codecov]
+passenv = CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_*
+deps = codecov
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+    codecov
+