Merge pull request #26 from facelessuser/vendor-pep562

vendor pep562
facelessuser · Mar 20, 2019 · 47e243b · 47e243b
2 parents 75dbbbf + 0a7ae6d
commit 47e243b
Show file tree

Hide file tree

Showing 12 changed files with 271 additions and 17 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+omit=
+    backrefs/pep562.py
+
+[report]
+omit=
+    backrefs/pep562.py
diff --git a/.pyspelling.yml b/.pyspelling.yml
@@ -17,10 +17,8 @@ matrix:
       - title
       - alt
       ignores:
-      - ':matches(code, pre)'
-      - 'a:matches(.magiclink-compare, .magiclink-commit, .magiclink-repository)'
-      - 'span.keys'
-      - ':matches(.MathJax_Preview, .md-nav__link, .md-footer-custom-text, .md-source__repository, .headerlink, .md-icon)'
+      - ':is(code, pre, a.magiclink, span.keys)'
+      - ':is(.MathJax_Preview, .md-nav__link, .md-footer-custom-text, .md-source__repository, .headerlink, .md-icon)'
   - pyspelling.filters.url:
 
 - name: markdown
@@ -49,7 +47,7 @@ matrix:
 - name: python
   sources:
   - setup.py
-  - "{wcmatch,tests}/**/*.py"
+  - "{wcmatch,tests,tools}/**/*.py"
   hunspell:
     d: docs/src/dictionary/hunspell/en_US
   aspell:

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 facelessuser
+Copyright (c) 2018 - 2019 facelessuser
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/docs/src/dictionary/en-custom.txt b/docs/src/dictionary/en-custom.txt
@@ -1,8 +1,10 @@
 API
 Accessors
+Backport
 Changelog
 EmojiOne
 Fnmatch
+GitHub
 Glob
 Lookahead
 MERCHANTABILITY

diff --git a/docs/src/markdown/changelog.md b/docs/src/markdown/changelog.md
@@ -1,7 +1,8 @@
 # Changelog
 
-## 2.0.4
+## 2.1.0
 
+- **NEW**: Deprecate `version` and `version_info` in favor of the more standard `__version__` and `__version_info__`.
 - **FIX**: Fix issue where negated patterns would trigger before end of path.
 - **FIX**: Fix `GLOBSTAR` regular expression pattern issues.
 

diff --git a/docs/src/markdown/license.md b/docs/src/markdown/license.md
@@ -4,7 +4,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2018 Isaac Muse
+Copyright (c) 2018 - 2019 Isaac Muse
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/theme/extra-83f68d2c59.css → docs/theme/extra-30d8e6755c.css b/docs/theme/extra-83f68d2c59.css → docs/theme/extra-30d8e6755c.css
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -4,8 +4,8 @@ repo_url: https://github.com/facelessuser/wcmatch
 edit_uri: tree/master/docs/src/markdown
 site_description: A wildcard file name matching library
 copyright: |
-  Copyright &copy; 2014 - 2018 <a href="https://github.com/facelessuser">Isaac Muse</a>
-  <br><span class="md-footer-custom-text">emoji provided free by </span><a href="http://www.emojione.com">EmojiOne</a>
+  Copyright &copy; 2014 - 2019 <a href="https://github.com/facelessuser">Isaac Muse</a>
+  <br><span class="md-footer-custom-text">emoji provided free by <a href="http://www.emojione.com">EmojiOne</a></span>
 
 docs_dir: docs/src/markdown
 theme:
@@ -86,6 +86,6 @@ extra:
     - type: github
       link: https://github.com/facelessuser
 extra_css:
-  - extra-83f68d2c59.css
+  - extra-30d8e6755c.css
 extra_javascript:
   - extra-0b9b22dd13.js
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 skipsdist=true
 envlist=
-    {py34,py35,py36,py37,py38},
+    py34,py35,py36,py37,py38,
     lint
 
 [testenv]
@@ -28,7 +28,7 @@ commands=
     {envbindir}/pyspelling
 
 [flake8]
-exclude=build/*,.tox/*
+exclude=build/*,.tox/*,wcmatch/pep562.py
 max-line-length=120
 ignore=D202,D203,D401,N802,N801,N803,N806,E741,W504
 

diff --git a/wcmatch/__init__.py b/wcmatch/__init__.py
@@ -20,7 +20,7 @@
 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 """
-from pep562 import Pep562
+from .pep562 import Pep562
 import sys
 import warnings
 from .__meta__ import __version_info__, __version__

diff --git a/wcmatch/__meta__.py b/wcmatch/__meta__.py
@@ -186,5 +186,5 @@ def parse_version(ver, pre=False):
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(2, 1, 0, ".dev")
+__version_info__ = Version(2, 1, 0, "final")
 __version__ = __version_info__._get_canonical()