summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Fix integer_types type under python 3Doug Hellmann2013-07-211-1/+1
| | | | | | | | | | | | | | | | Set the integer_types variable to the same kind of object under python 3 and 2 so that when we go to manipulate it later it works. Change-Id: I8f9db1d76931ef834645095952f71415d98f0b5c
* | Add libffi-devMonty Taylor2013-07-201-1/+1
|/ | | | Change-Id: I4dc822eba0e1597e9eec1ec057d37871d930eb84
* Merge "Add Python 3.3 checking"0.5.19Jenkins2013-07-162-0/+14
|\
| * Add Python 3.3 checkingJulien Danjou2013-07-152-0/+14
| | | | | | | | | | | | This adds support for a working py33 tox target. Change-Id: Icfe1ed7dd256568f33487d03ba9c9be9a454c84a
* | Merge feature/merged2to1 into masterMonty Taylor2013-07-1233-30/+1637
|\ \ | |/ |/| | | | | | | | | Upstream d2to1 has been rather unresponsive, and doing what we need in this case is really easier without the extra complexity. Change-Id: Ibd16944e76ad8398b57b6ddcbcd150cd462add3e
| * Fix some issues in setup.py testMonty Taylor2013-07-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | While tracking down a troveclient issue, found several issues in the new python setup.py test command: * check the right source files when we're trying to decide whether to re-run egg_info * fix bogus dependency links args when installing test requires * fix bogus .egg_info dir name when a project name includes a hyphen Change-Id: I0a1964902a87f72eb67f43b10f90dfee8c7d7875
| * Merge "Put AUTHORS.in at the top of AUTHORS." into feature/merged2to1Jenkins2013-07-121-4/+4
| |\
| | * Put AUTHORS.in at the top of AUTHORS.Monty Taylor2013-07-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | swift has an AUTHORS file that puts a header at the top of the file with some extra information, then lists the contributors. If we put AUTHORS.in at the top of the generated file, then we can put their boilerplate into AUTHORS.in and the resulting file should look the same. Change-Id: I2caa4e606dd1199f49c925dccc64d492848ac580
| * | Merge "Support version override with PBR prefix." into feature/merged2to1Jenkins2013-07-121-1/+3
| |\ \
| | * | Support version override with PBR prefix.Monty Taylor2013-07-111-1/+3
| | |/ | | | | | | | | | | | | | | | | | | For non-OpenStack consumption of PBR, OSLO_PACKAGING_ is a weird version override env var. Change-Id: I8e80bcc5bc56e7950ed5cf0d24657957570134cf
| * | Allow pip installation to be skipped.Monty Taylor2013-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Distro packagers don't really need for us to attempt to pip install things for them. They're usually managing that dependency tree in the distro packaging. Add an env var they can set in their spec or rules files to skip any pretense of doing anything with install requirements. Change-Id: Ia6387eab3267fa3c4019c4a9d90e4780319c2397
| * | Don't run pip needlesslyMonty Taylor2013-07-111-7/+9
| |/ | | | | | | | | | | | | | | We can detect if the env we are a part of has our requirements met already. If this is the case, don't re-run pip at all, so that we don't waste time. Change-Id: If49cd7bd558f98d8e6f51b0fe0192978bee9c77e
| * Clean up hacking and path issues with d2to1Monty Taylor2013-07-1126-1253/+555
| | | | | | | | | | | | | | We imported in another code base. It takes a little bit of path adjusting to get things right. Change-Id: Ifb96652c822d5d243a6bedb77bc34e919be2d3a8
| * Merge d2to1 into the tree, complete with history.Monty Taylor2013-07-0627-0/+2311
| |\
| | * Add support for namespace packages.Monty Taylor2013-07-061-0/+2
| | | | | | | | | | | | | | | Without this, packages with namespace packages do not properly create .egg-info/namespace_packages.txt
| | * Make parse errors meaningful.Monty Taylor2013-05-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the error displays on a bad setup.cfg value go from: error in setup command: Error parsing setup.cfg: IOError: 2 to error in setup command: Error parsing setup.cfg: IOError: No such file or directory: 'README' Which makes debugging eversomuch better.
| | * Added some additional zest.releaser hooks to deal with some perpetual ↵Erik M. Bray2013-04-101-0/+87
| | | | | | | | | | | | | | | | | | annoyances of doing releases. git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@24209 fe389314-cf27-0410-b35b-8c050e845b92
| | * When catching exceptions from a setup-hook don't throw a traceback up for ↵Erik M. Bray2013-04-091-0/+2
| | | | | | | | | | | | | | | | | | sys.exit() git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@24204 fe389314-cf27-0410-b35b-8c050e845b92
| | * Remove extra complexity of six.u wrapper.Monty Taylor2013-03-131-1/+1
| | |
| | * Move setup_requires to setup_requires_dist.Monty Taylor2013-03-121-1/+1
| | | | | | | | | | | | In anticipation of pep-426
| | * Add a few more backwards compatibility options.Monty Taylor2013-03-111-1/+6
| | |
View Lorry Controller Status