Merge pull request #1 from pypa/master

merge all changes from upstream

Author: mr-rodgers

.gitignore

@@ -1,86 +1,28 @@
-*.sublime-workspace
-# Created by .ignore support plugin (hsz.mobi)
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion
 
 *.iml
 
 ## Directory-based project format:
 .idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
 
 
 ### Python template
-# Byte-compiled / optimized / DLL files
+# Byte-compiled / optimized
 __pycache__/
 *.py[cod]
 *$py.class
 
-# C extensions
-*.so
 
 # Distribution / packaging
-.Python
+.env/
 env/
 build/
-develop-eggs/
 dist/
-downloads/
-eggs/
 .eggs/
 lib/
 lib64/
-parts/
-sdist/
-var/
 *.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
 
 # Installer logs
 pip-log.txt
@@ -96,15 +38,5 @@ nosetests.xml
 coverage.xml
 *,cover
 
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
 # Sphinx documentation
 docs/_build/
-
-# PyBuilder
-target/

.hgignore

@@ -1,39 +1 @@
-5a1fb86fd036b7de8b0d9652d8e47617cf2acbd9 0.1
-bb5b77c4d44a0ff5d80cf3c141e831e77c718f02 0.2
-6ff0dcbf7770ebb4dd593a4b435bc46ac909e6ab 0.3
-1acb97d6a55aa0b956db8193fc7fae50bd065c0f 0.4
-62dae146b56bc1828102b61e9b6667dfc63c006e 0.5
-836009e39e255ae221e32d43a7004b60fe0269a5 0.6
-156ee55e5c5154c1838374f7c44775613755c2df 0.7
-bfa4d0354c33c05e1e5d58b9060b54c60d9b4e86 0.8
-630256b99077bb5e77bfeb96df058ddd98d517f1 v0.9
-c1bdd4532888a0d653e2b92b774fb7ec158d99fe v0.10
-ca5ab7702e0abbf4f8c846d2422ecc7547334b8f v0.11
-1ff10ede9752968a4f7f7caa2fb75ada1523ad4c v0.12
-28e8bfd75e24bb237cb127939066812c0772f454 v0.13
-c1a2f630f85f26bf97f3c43aa0d6e788bc4f6911 v0.14
-40c3034fbf77b3eec7793c51e49700a72aaecaed v0.15
-98c422bd9979ee2337b6aeb0c97d2d67e3b0ca9d v0.16
-acf94020b01dddef99dd062e70d653f31227bfc1 fun
-449046fe8ac80306c0aab4238f866d0415825027 v0.17
-c863bbaf37a52b22011009631734d51866801d36 v0.18
-c055726a3dbd8ee13e3375d90628018bfa363655 v0.19
-145583fdc0ddac2814566ced1a1cc0cf2fa937fc v0.20
-c7db6b8a56dc63fee018f9a932855f599d5cf103 v0.21
-94cba47d598caf2f5de1d11b795fc5c716d4731b v0.22
-a261171f3995ab354b9074be6dd101bbe5d854ad v0.23
-4fb06cd94326c47602d3a71e554da57461968327 v0.24
-6032e2451ecce6cc7ef17252261e182407ad9776 v0.25
-710108024954aeb8dcfa82f0fa004695164e7af7 v0.26
-4fc12441ad28a14561d86ae3862ff96dd4250c3a v1.0.0
-6b87eb7b2f24760758696de642f889a95ca6ae2e v1.1.0
-10e1e1aa407cbc8cd0853249b8adfaece44a6afc v1.2.0
-09958ba5ec6a711a25411bc3473c49f08cffe504 v1.3.0
-5532a024bba6159f1adc8bf8cd56c9b1946991bd v1.4.0
-5cd2569410b5edc45e8294154b7326c91681222b v1.4.1
-4fe1d9fcc3b0dd53de296d829159fe533d5f1dd2 v1.5.0
-8d43dd687e7ad7e2f5f2558478a1c243d6c272cd v1.5.1
-5a29ae7e98cac33723f57b3f14f4b1cb39f42379 v1.5.2
-e8e83b611dc80cf04aa1c23c885c02b18636218b v1.5.3
-ff26814d7c5f195ec12ef937eee2d51fde01cc2f v1.5.4
-ef699dd35ae817d0f02ab5cd09a59e0af4211fe4 v1.5.5
+1092123ef78598eade56aa9c57e484f3670c8da8 v1.9.0

.hgtags

@@ -1,17 +1,26 @@
 language: python
+sudo: false
 python:
-    - '2.6'
-    - '2.7'
-    - '3.3'
-    - '3.4'
-    - nightly
-
-matrix:
-    allow_failures:
-        - python: nightly
-
+- '2.6'
+- '2.7'
+- '3.3'
+- '3.4'
+- '3.5'
+cache:
+  files:
+  - $HOME/.pip/cache
+  - $Home/.cache/pip
 install: pip install tox
-
 script:
-    - tox -e py
-    - tox -e flake8
+- tox -e py-test,flake8
+deploy:
+  provider: pypi
+  user: ronny
+  password:
+    secure: QGJhDXmfFDKysMJJV/ONGaHHzG/aImhU3DdhEP63d657iQSn/Cb4EG/l9YmVnRzpJ94nSDXZB8YwptR7rid0bOtidb32lxN8n6UiWILCXWeAN2FE+tT9/0xIct4HUJZ8OttD1gft/Di722Gy+s9PzFwjwrV4efkxCzgjfYOjkMeq3aO6NoG3ur0iZXJh7ODwLp4sRFep2NpIEaXm2qMdnnXpck6bJ1q/NtvPx9CAZivd9HYa0evg5j1ENTz1mXXafhgF+0vRCBXA33xJuysO6CKtk+2mizL1QHfosOERiKl9+zPyZw+VvSchbCVwgxrMSiRcpGag+4SegyHrj1M/2YqfFzMF/yuFGcqXl2VkEqlnBQOVMNW3Kdcmnm+caNbddnv+M384WFz4nV8nWjcsD5l27+XlMWfuvskDIvZKtVCXmmbtqgwM4tqoYd6uxbnooRfwINTGx8sNzKP10xkaesB3ZBCEpecOKA1AXUAZ74RfYWWExv6eIuVGwyIJmOcD8M/17N8g58GxxO+88gx50EuhyNiRjYZDUipfVydfJwBwpD+p695NixUMITuksucQftjHsQp+laGWJlDIPvFwI85wDJUYAyrzn6L1W+smkm1bGomuliW2MJfxeSZAmSk4CE5VOpIWQTBmDLR3pxBhcaqzwdd4mAWvMi/fpM4yJJI=
+  on:
+    tags: true
+    python: '2.7'
+
+
+  distributions: "sdist bdist_wheel"

.travis.yml

@@ -1,3 +1,71 @@
+v1.11.0
+=======
+
+* always run tag_to_version so in order to handle prefixes on old setuptools
+  (thanks to Brian May)
+* drop support for python 3.2
+* extend the error message on missing scm metadata
+  (thanks Markus Unterwaditzer)
+* fix bug when using callable version_scheme
+  (thanks Esben Haabendal)
+
+v1.10.1
+=======
+
+* fix issue #73 - in hg pre commit merge, consider parent1 instead of failing
+
+v1.10.0
+=======
+
+* add support for overriding the version number via the
+  environment variable SETUPTOOLS_SCM_PRETEND_VERSION
+
+* fix isssue #63 by adding the --match parameter to the git describe call
+  and prepare the possibility of passing more options to scm backends
+
+* fix issue #70 and #71 by introducing the parse keyword
+  to specify custom scm parsing, its an expert feature,
+  use with caution
+
+  this change also introduces the setuptools_scm.parse_scm_fallback
+  entrypoint which can be used to register custom archive fallbacks
+
+
+v1.9.0
+======
+
+* Add :code:`relative_to` parameter to :code:`get_version` function;
+  fixes #44 per #45.
+
+v1.8.0
+======
+
+* fix issue with setuptools wrong version warnings being printed to standard
+  out. User is informed now by distutils-warnings.
+* restructure root finding, we now reliably ignore outer scm
+  and prefer PKG-INFO over scm, fixes #43 and #45
+
+v1.7.0
+======
+
+* correct the url to github
+  thanks David Szotten
+* enhance scm not found errors with a note on git tarballs
+  thanks Markus
+* add support for :code:`write_to_template`
+
+v1.6.0
+======
+
+* bail out early if the scm is missing
+
+  this brings issues with git tarballs and
+  older devpi-client releases to light,
+  before we would let the setup stay at version 0.0,
+  now there is a ValueError
+
+* propperly raise errors on write_to missuse (thanks Te-jé Rodgers)
+
 v1.5.5
 ======
 
@@ -24,7 +92,7 @@ v1.5.1
 * fix file access bug i missed in 1.5
 
 v1.5.0
-=======
+======
 
 * moved setuptools integration related code to own file
 * support storing version strings into a module/text file
@@ -49,30 +117,30 @@ v1.2.0
 * enhance self-use
 
 v1.1.0
-=======
+======
 
 * enable self-use
 
 v1.0.0
-=======
+======
 
 * documentation enhancements
 
 v0.26
-======
+=====
 
 * rename to setuptools_scm
 * split into package, add lots of entry points for extension
 * pluggable version schemes
 
 v0.25
-======
+=====
 
 * fix pep440 support
   this reshuffles the complete code for version guessing
 
 v0.24
-======
+=====
 
 * dont drop dirty flag on node finding
 * fix distance for dirty flagged versions
@@ -99,19 +167,19 @@ v0.22
   use samefile since it does path normalisation
 
 v0.21
-======
+=====
 
 * fix the own version attribute (thanks stefan)
 
 v0.20
-======
+=====
 
 * fix issue 11: always take git describe long format
   to avoid the source of the ambiguity
 * fix issue 12: add a __version__ attribute via pkginfo
 
 v0.19
-=======
+=====
 
 * configurable next version guessing
 * fix distance guessing (thanks stefan)