summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* another changelog updatev1.12.0Ronny Pfannschmidt2016-10-051-0/+2
|
* update changelogRonny Pfannschmidt2016-10-051-1/+6
|
* Merge pull request #102 from anarcat/pretend-writeRonny Pfannschmidt2016-10-052-6/+12
|\ | | | | properly write version file even if in pretend mode
| * properly write version file even if in pretend modeAntoine Beaupré2016-10-052-6/+12
|/ | | | | | | | | | | | | | | | | | | | | before this, SETUPTOOLS_SCM_PRETEND_VERSION make setuptools_scm fail to write the `write_to` file correctly. this was apparently to avoid issues with archives, which we believe is not a problem anymore. this *is*, however, a problem for other tools like Debian packaging: there, we use the pretend mechanism to import the version number from the Debian packaging system (from `debian/changelog`, usually). this works at setup time: setuptools_scm has the proper environment and detects the version. but if the software was written to depend on the `write_to` file, it will fail to find that version at runtime because `setup.py` will not have written the `write_to` file properly at build time. this patch simply makes sure that the version is written even if the provided version number is a string, which is usually the case for pretend version numbers. a fixed test case is also provided. Closes: #101
* Show python code in the README properly (#100)Wieland Hoffmann2016-09-041-2/+2
| | | | | | * Fix a typo * Remove a colon to show inline code properly
* Merge pull request #98 from RonnyPfannschmidt/reenable-hgrcpathRonny Pfannschmidt2016-08-292-3/+1
|\ | | | | allow HGRCPATH env var - potentially fixes #97
| * explicitly specify merge tool for hg merge testRonny Pfannschmidt2016-08-291-1/+1
| |
| * allow HGRCPATH env var - potentially fixes #97Ronny Pfannschmidt2016-08-291-2/+0
|/
* Merge pull request #99 from RonnyPfannschmidt/fix-travisRonny Pfannschmidt2016-08-291-1/+10
|\ | | | | work up travis matrix
| * work up travis matrixRonny Pfannschmidt2016-08-291-1/+10
|/
* update changelogv1.11.1Ronny Pfannschmidt2016-06-121-0/+7
|
* Merge pull request #91 from te-je/masterRonny Pfannschmidt2016-06-122-2/+18
|\ | | | | Case-insensitive path comparison for git on windows. Fixes #89
| * fix #89: windows path comparison bugTe-jé Rodgers2016-06-122-2/+18
| |
| * Merge pull request #1 from pypa/masterTe-jé Rodgers2016-06-1225-374/+596
| |\ | | | | | | merge all changes from upstream
* | \ Merge pull request #90 from pypa/issue-88Ronny Pfannschmidt2016-06-121-2/+3
|\ \ \ | |_|/ |/| | Correct typo and clarify Sphinx recommended usage. Fixes #88.
| * | Correct typo and clarify Sphinx recommended usage. Fixes #88.Jason R. Coombs2016-06-031-2/+3
|/ /
* | limit pypi deploy to python 2.7v1.11.0Ronny Pfannschmidt2016-04-061-0/+3
| |
* | add pypi deploy on tagsRonny Pfannschmidt2016-04-061-1/+8
| |
* | update changelogRonny Pfannschmidt2016-04-061-1/+12
| |
* | Merge pull request #85 from esben/masterRonny Pfannschmidt2016-04-062-2/+22
|\ \ | | | | | | fix bug when using callable version_scheme
| * | fix bug when using callable version_schemeEsben Haabendal2016-04-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug introduced with 0f1c98d032b421f65c8ef5b1042386a6b64bf0b6, looking like this: Complete output from command python setup.py egg_info: Traceback (most recent call last): File "<string>", line 1, in <module> File "/tmp/pip-build-zfpnaarq/xd-docker/setup.py", line 69, in <module> setup_requires=['setuptools_scm'], File "/usr/local/lib/python3.4/distutils/core.py", line 108, in setup _setup_distribution = dist = klass(attrs) File "/usr/local/lib/python3.4/site-packages/setuptools/dist.py", line 272, in __init__ _Distribution.__init__(self,attrs) File "/usr/local/lib/python3.4/distutils/dist.py", line 280, in __init__ self.finalize_options() File "/usr/local/lib/python3.4/site-packages/setuptools/dist.py", line 327, in finalize_options ep.load()(self, ep.name, value) File "/usr/local/lib/python3.4/site-packages/setuptools_scm-1.10.2.dev8+ng4835e4d-py3.4.egg/setuptools_scm/integration.py", line 16, in version_keyword AttributeError: 'function' object has no attribute 'pop' Signed-off-by: Esben Haabendal <esben@haabendal.dk>
| * | add regression test for callable use_scm_versionEsben Haabendal2016-04-061-0/+20
|/ / | | | | | | Signed-off-by: Esben Haabendal <esben@haabendal.dk>
* | Merge pull request #82 from untitaker/error-message3Ronny Pfannschmidt2016-03-171-3/+5
|\ \ | | | | | | Improve error message, third take
| * | Improve error message, third takeMarkus Unterwaditzer2016-03-141-3/+5
|/ / | | | | | | | | | | Turns out there are much more scenarios other than GitHub tarballs where setuptools-scm fails: Nix is able to build from a git commit, but will delete the `.git` folder.
* | drop python 3.2 since pip dropped itRonny Pfannschmidt2016-01-311-1/+0
| |
* | Merge pull request #80 from agronholm/masterRonny Pfannschmidt2016-01-311-0/+4
|\ \ | | | | | | Added Python version classifiers to setup.py
| * | Added Python version classifiers to setup.pyAlex Grönholm2016-01-311-0/+4
|/ /
* | Merge pull request #76 from brianmay/fix_v_prefixRonny Pfannschmidt2016-01-181-1/+2
|\ \ | | | | | | Ensure we call tag_to_version, fixed #61
| * | Update comment for previous changeBrian May2016-01-171-0/+1
| | |
| * | Ensure we call tag_to_versionBrian May2016-01-141-1/+1
|/ / | | | | | | Closes #61
* | fix issue #72 - handle hg pre commit merge statesv1.10.1Ronny Pfannschmidt2015-12-103-2/+19
| |
* | make readme pypi compatible againv1.10.0Ronny Pfannschmidt2015-12-071-2/+1
| |
* | prepare 1.10.0 releaseRonny Pfannschmidt2015-12-071-0/+2
| |
* | whitespace fixesRonny Pfannschmidt2015-12-071-3/+2
| |
* | introduce parse_scm_fallback concept and fix parse hooksRonny Pfannschmidt2015-12-074-14/+42
| | | | | | | | | | before parse hooks would just break if the scm they would use was not availiable now after parse, setuptools-scm runs the fallbacks
* | coding and documentation style cleanupsRonny Pfannschmidt2015-12-073-6/+8
| |
* | introduce scm parser overriding fixes #70 and #71Ronny Pfannschmidt2015-12-064-1/+18
| |
* | support enforcing version numbers via the envRonny Pfannschmidt2015-12-014-0/+23
| |
* | Merge pull request #68 from pypa/issue-67Ronny Pfannschmidt2015-11-301-0/+11
|\ \ | | | | | | fix issue #67
| * | add missing spaceRonny Pfannschmidt2015-11-301-1/+1
| | |
| * | first attempt at fixing issue #67Ronny Pfannschmidt2015-11-301-0/+11
|/ /
* | minor flake8 cleanupRonny Pfannschmidt2015-11-291-1/+1
| |
* | address #63 - change the tag matching patternRonny Pfannschmidt2015-11-291-1/+1
| | | | | | | | unfortunately the regex only worked on the recent git on fedora 23
* | fix issue #63 by passing a match parameter to git describeRonny Pfannschmidt2015-11-293-2/+16
| |
* | finish restructuring testsRonny Pfannschmidt2015-11-293-25/+55
| |
* | simplify callable_or_entrypoint(group, callable_or_name)Ronny Pfannschmidt2015-11-281-2/+2
| |
* | remove forgotten testsRonny Pfannschmidt2015-11-281-34/+0
| | | | | | | | due to git missuse the file cahnge was not added in the previous commit
* | extract git testsRonny Pfannschmidt2015-11-281-0/+34
| |
* | finish extracting mercurial tests into own fileRonny Pfannschmidt2015-11-283-95/+90
| |
* | simplify data from mime testRonny Pfannschmidt2015-11-281-4/+3
| |
View Lorry Controller Status