summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Replace setuptools_git with a smarter approach"0.5.21Jenkins2013-08-047-19/+145
|\
| * Replace setuptools_git with a smarter approachMonty Taylor2013-08-047-19/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a local egg_info command that only re-generates the SOURCES.txt file when we need to. That is: - If there is no SOURCES.txt, make one - If we have run the sdist command, make one Otherwise, leave well enough alone. Also, skip doing any git processing if SKIP_GIT_SDIST is specified. This should mean that consumers of our tarballs should not get screwed by the need to inject git processing into the sdist. Change-Id: I163b1c153d030e79b120600a2890edeb49e1fa90
* | Merge "Clean up some style warnings"Jenkins2013-08-041-3/+3
|\ \ | |/ |/|
| * Clean up some style warningsMonty Taylor2013-08-031-3/+3
| | | | | | | | | | | | | | | | ksh -n, weirdly enough, can be used as a rudimentary syntax and style checker for bash. tools/integration.sh was mostly clean, but it suggested that `` should be replaced with $(). Sure, why not. Change-Id: I76beff1194133444284c1e8fbbd5d87db369e47f
* | Merge "Improve AUTHORS file generation"Jenkins2013-08-042-15/+24
|\ \
| * | Improve AUTHORS file generationSergey Lukjanov2013-08-032-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | * remove authors/co-authors duplicates * sort all authors/co-authors * add a new line to the end of file Change-Id: I48a388e8ae2defd05ad617d5de709d0e623a5c36
* | | Merge "Ensure _run_shell_command always returns same type"Jenkins2013-08-042-1/+107
|\ \ \ | |/ / | | / | |/ |/|
| * Ensure _run_shell_command always returns same typeDoug Hellmann2013-08-022-1/+107
| | | | | | | | | | | | | | | | | | | | | | If _run_shell_command gets no output, return an empty string instead of None. This ensures that callers can always treat the results as a string, and avoids the TypeError that was preventing the ChangeLog and AUTHORS files from being created properly in a git repository without any commits. Change-Id: I880210bc3ff92ece29b216a10e1d0c918f884eaf
* | Consume the OpenStack mirror by defaultMonty Taylor2013-08-031-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PyPI upstream obviously breaks all the time. Like, literally, I've spent my whole life dealing with it this past week. In this test, we were avoiding the OpenStack mirror so that we could be sure to be testing that we could build the mirror when new requirements are added. However, the only time that's a concern is on a requirements repo change. Add an option --no-mirror that will trigger the "don't use OpenStack's mirrors as an upstream" behavior, and we'll add that option to the invocation on requirements changes. Change-Id: I8d01c1fbb8a5df5aa83ffba3b6489e374abef1af
* | Correct typoMonty Taylor2013-08-031-1/+1
|/ | | | | | The filter for not double running ourself was mis-spelled. Change-Id: Ief500bb4426f74cf5d41440a80056ae4122f6fcb
* Merge "Use the same logic everywhere for requirements files"Jenkins2013-08-021-7/+12
|\
| * Use the same logic everywhere for requirements filesJulien Danjou2013-07-301-7/+12
| | | | | | | | | | | | | | | | Currently, the environment variable isn't always respected, especially when dealing with the egg_info command. Let's factorize the code into a function and use it everywhere instead of the REQUIREMENTS_FILES variable. Change-Id: I1c3224ef76ee724c8176eb00ef948d80259e3c17
* | Merge "Hierarchical sphinx API documentation generation"Jenkins2013-08-011-9/+26
|\ \
| * | Hierarchical sphinx API documentation generationAttila Fazekas2013-07-311-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding a new pbr boolean option 'autodoc_tree_index_modules' for creating a package/module hierarchy oriented API documentation. * Using the sphinx.apidoc module in order to generate the *.rst files and the modules.rst. The sphinx.apidoc.main function call expected to be more future proof, than the other options. Change-Id: I145086387edf6b042368d4c16dd64948f67606b0
* | | Merge "Add skip_pip_install to setup.cfg"Jenkins2013-08-011-4/+11
|\ \ \ | |/ / |/| |
| * | Add skip_pip_install to setup.cfgMonty Taylor2013-07-301-4/+11
| | | | | | | | | | | | | | | | | | | | | The envvar SKIP_PIP_INSTALL isn't enough in all cases. Add the ability to configure this in the config file. Change-Id: Ic84bd6df52d2b96bf4afcaacd9c8b6fee26e9840
* | | Merge "Add support for classmethod console scripts"Jenkins2013-07-314-23/+34
|\ \ \
| * | | Add support for classmethod console scriptsMaru Newby2013-07-314-23/+34
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Previously console_scripts could only reference functions: script_name = package.name:function_name This change adds support for classmethods: script_name = package.name:ClassName.classmethod_name This change is necessary to support a Neutron use-case. * Fixes bug 1206734 Change-Id: I9509d3f2cea29fee5696936dbbb1d507764f1e81
* | | Merge "Fix .mailmap file search location"Jenkins2013-07-312-10/+15
|\ \ \ | |_|/ |/| |
| * | Fix .mailmap file search locationSergey Lukjanov2013-07-272-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | It should be in the root project dir, not in the .git dir. Fixes: bug #1202375 Change-Id: I5d7cd61f3ec9323afed371c7082f2694a7e8347c
* | | Remove missing_reuqires optimizationMonty Taylor2013-07-301-23/+7
| |/ |/| | | | | | | | | | | | | The attempt to optimize away some shell calls to pip wound up having python setup.py install not do the right thing with missing transitive depends. Remove the optimization check. Change-Id: I0db9cc18fda98b8f53b61422e730fd76e0c6a0c1
* | Merge "Loop over test output for better readability"0.5.20Jenkins2013-07-271-1/+2
|\ \
| * | Loop over test output for better readabilityMonty Taylor2013-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The way _run_cmd was working meant that in a test failures, the captured output was a giant blob of text with \n strings inside it, making it unreadable. By looping and printing, it becomes readable again. Change-Id: I2db3057c34e2a50f7a420f2dbcf45c6ec874b632
* | | Merge "Add support for globbing in data files"Jenkins2013-07-275-27/+133
|\ \ \
| * | | Add support for globbing in data filesMonty Taylor2013-07-245-27/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to the work in the packages argument, allow the specification of a directory to recursively include as part of the install. Change-Id: Ife0414af468e7fcd4fc419eafc3e19e29efcfc7b
* | | | Merge "Revert include_package_data change"Jenkins2013-07-272-0/+6
|\ \ \ \
| * | | | Revert include_package_data changeMonty Taylor2013-07-232-0/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the value directly in kwargs is not doing what we want it to do. This is largely because of how the hook system works. When the hooks process backwards_compat, they do a config.get('backwards_compat', dict()), which is then written back to the config dict - which means that blank override values are being fed in. Later we can go through and just re-engineer how that works. For now, unbreak nova. Change-Id: I0c6055253cbc89b6884553e6f2fbfe8a7bbd1953
* | | | Merge "Also patch easy_install script creation"Jenkins2013-07-273-2/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Also patch easy_install script creationMonty Taylor2013-07-233-2/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | During python setup.py develop, easy_install is called via a different code path to install the scripts. We need to inject into that place as well. Change-Id: Iab319f3771529c6d57f6a36ec717fb3278839f78
* | | Swap the order of configparser importsMonty Taylor2013-07-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configparser backport package has un-understood issues parsing our files. But the intent of the code is to use whichever is the package for the version of python in use. So, instead of trying to install the python3 version first, which can also result in loading the backport package, first try the python2 package, so that if configparser itself is loaded, it will be because we're running python3. Change-Id: I7ef497127822d0110804b04a674f24c195a07278
* | | Install jeepyb and requirements from REPODIRMonty Taylor2013-07-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | integration.sh already expects there to be a pbr source dir in $REPODIR/pbr. If we pull jeepyb and requirements from the same place, then we can gate them as wel as pbr. Change-Id: Ie0eb513c2deade957d480a25dfba2c5486d14876
* | | Stop trying to install old pip and setuptoolsMonty Taylor2013-07-251-3/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Now that pip 1.4 is out, setuptools<0.7 is invalid because 1.4 will not install 'pre-release' software without being explicitly asked, and all of the pre 0.7 setuptools releases have a letter in them. Just stop trying to do it, because we actually don't use it anyway. Additionally, we were trying to intsall pip 1.3 for a test but were not installing that into the local mirror. Match them so that they're equal and can install. Change-Id: I61b9b810e64b40ceccb5eb0f4b2ddc4faefd8e04
* | Merge "Add more documentation"Jenkins2013-07-223-124/+188
|\ \ | |/
| * Add more documentationMonty Taylor2013-07-213-124/+188
| | | | | | | | | | | | | | | | Moved a good portion of README into the sphinx docs. Also started fleshing out descriptions of how to use things. Also, fix the sphinx config. Change-Id: If53dcdaea0a48ef613e3097ab55d34f056160188
* | Merge "We force installs via pip, we should declare it"Jenkins2013-07-221-0/+1
|\ \
| * | We force installs via pip, we should declare itMonty Taylor2013-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pbr contains code that very explicitly uses pip, which means that pip is a requirement. Note to packagers: it is possible to skip uses of pip, meaning that you can totally use pbr-based things without needing to have them pip install things. Change-Id: Ifa472f344489295a5b8a1910bff2672087653547
* | | Merge "Ignore project creator while generating AUTHORS"Jenkins2013-07-221-2/+2
|\ \ \
| * | | Ignore project creator while generating AUTHORSSergey Lukjanov2013-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New projects created by OpenStack Project Creator <openstack-infra@lists.openstack.org>, so it'll be better to remove it from the AUTHORS file. Change-Id: I32975bd430635a38c7e737e70f381f7b07c6ed0c
* | | | Merge "Do not assume the tests run as jenkins"Jenkins2013-07-221-2/+2
|\ \ \ \
| * | | | Do not assume the tests run as jenkinsDoug Hellmann2013-07-211-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use $HOME instead of "/home/jenkins" in the generated configuration files to let the script be run as a user other than jenkins. Change-Id: I9413591bb4a7d821382eae6dc3edd1df0c41a5e6
* | | | Merge "Replace entry_points console_scripts"Jenkins2013-07-227-1/+157
|\ \ \ \ | | |/ / | |/| |
| * | | Replace entry_points console_scriptsMonty Taylor2013-07-217-1/+157
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The console scripts generated by entry_points are too complex for our needs and make things run slowly in service of a multi-version install that we don't use. Instead, install a simple script which just does a direct import. Change-Id: I1ec46837cea07db514f2fb6338c7bced34a83c4a
* | | Merge "Remove the need to specify the pbr hook"Jenkins2013-07-223-4/+8
|\ \ \ | |/ /
| * | Remove the need to specify the pbr hookMonty Taylor2013-07-213-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | If you're running pbr codepaths, you want the hook. There is no need to say "pbr=True" in setup.py and then to list the hook in setup.cfg now that d2to1 is in the tree. Change-Id: Ie33d3e08d5a4133f5caf2613859919ce4f02c4a0
* | | Merge "Move d2to1 more into the source tree"Jenkins2013-07-2226-117/+92
|\ \ \ | |/ /
| * | Move d2to1 more into the source treeMonty Taylor2013-07-2126-117/+92
| | | | | | | | | | | | | | | | | | | | | When we merged in d2to1, we kept it separate, but I don't think there is a great benefit to doing that. Change-Id: I3972b3132619e8e2dd7e362ca5fe9d1e3add43b8
* | | Merge "Fix python 3.3 tests"Jenkins2013-07-222-15/+1
|\ \ \
| * | | Fix python 3.3 testsDoug Hellmann2013-07-212-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can go back to using the official release of testrepository for testing under python 3, so do. Make python 3.3 part of the default environment set for anyone running all of the tests. Change-Id: I0c56f9cde643ef8580ab305080bc62b87809bf7e
* | | | Merge "Set defaults directly in option processing"Jenkins2013-07-212-1/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Set defaults directly in option processingMonty Taylor2013-07-212-1/+4
| |/ | | | | | | Change-Id: Iaa327862fc9e43aade2dd1ed66aa27f335f12ac7