summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Reverse ordering of 'D1_D2_SETUP_ARGS'"5.6.0Zuul2021-04-221-45/+38
|\
| * Reverse ordering of 'D1_D2_SETUP_ARGS'Stephen Finucane2021-04-221-45/+38
| | | | | | | | | | | | | | | | | | | | The previous ordering was confusing and placed new values before old ones. Switch this order, making it more obvious what we're going *from* and what we're going *to*. With this reordering, the old name no longer makes sense so we rename the attribute. Change-Id: Ic7b71f1093671533c9f17fd621e02299bfbd7a6d Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
* | Merge "Add test for cfg -> py transformation"Zuul2021-04-222-3/+104
|\ \ | |/
| * Add test for cfg -> py transformationStephen Finucane2021-04-222-3/+104
| | | | | | | | | | Change-Id: I176dc6a2c6d8f37717e1e17ba41ee72bef9536fb Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
* | Merge "Don't pass empty 'long_description'"Zuul2021-04-221-17/+15
|\ \ | |/
| * Don't pass empty 'long_description'Stephen Finucane2021-04-221-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Correct a small logic error that would result in us passing an empty 'long_description' value to 'setup' if 'description_file' pointed to a file that was empty. Fixing this also makes it a little more obvious that we are only setting values that are present in 'setup.cfg', since that wasn't totally clear before. A small, unrelated typo is addressed. Change-Id: Ib32b5fb5da84215376c8e372470b2ff08eb47908 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
* | Merge "Increase OS_TEST_TIMEOUT to 1200"Zuul2021-04-221-1/+1
|\ \ | |/ |/|
| * Increase OS_TEST_TIMEOUT to 1200Sorin Sbarnea2021-04-011-1/+1
| | | | | | | | | | | | | | | | We do not want to timeout just because installation of packages got bit slower. See: https://zuul.opendev.org/t/openstack/build/e14185c56a0f495ca21c3afd0c67a7aa Change-Id: I1915a4992c3e98c01d77d7feb72ddf6e8e383f09
* | Merge "Map requires-python to python-requires (attempt 2)"Zuul2021-04-161-0/+1
|\ \
| * | Map requires-python to python-requires (attempt 2)Stephen Finucane2021-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt two at the problem, this time done properly. As discussed in change I7158e75934535b80eb60d6b4b7dcef08866b5bab, the previous attempt actually mapped 'python_requires' to 'requires_python' rather than the other way around. This resolves that. Change-Id: I415b64d5b51a248d2f45a28234f1635e8b82ffcc Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
* | | Move flake8 as a pre-commit local target.Daniel Bengtsson2021-04-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal here is to avoid conflicts between flake8 and hacking version each 2 days. Inspired from nova's approach[1]. The flake8 version to install will be determined by hacking and requirements[2] will stay aligned instead of relying on different versions. [1] https://opendev.org/openstack/nova/src/branch/master/.pre-commit-config.yaml#L26-L35 [2] https://opendev.org/openstack/hacking/src/branch/master/requirements.txt#L1 Change-Id: Ia194a634df19386380caefa074e5ad593bf364d1
* | | Update dependencies to avoid failure with old pipSorin Sbarnea2021-04-061-2/+3
|/ / | | | | | | | | | | | | | | | | | | | | We do perform linting via pep8 job which runs on modern python only. This fixes an error that recently broke py27 job due to failure to install hacking, where hacking is in fact not even needed by it. We also need to add some extra conditions for mock to avoid possible failure with older pip version. Change-Id: I5007154caa7493652a424a4fad4918b7dbefcfb9
* | Merge "Prevent test failure due to use of setpref"Zuul2021-04-011-1/+0
|\ \
| * | Prevent test failure due to use of setprefSorin Sbarnea2021-04-011-1/+0
| |/ | | | | | | | | | | | | | | | | | | This fixes a bug that prevented successful test gpg key creation on some machines. gpg: invalid item '(setpref)' in preference string Bug: #1627102 Change-Id: I848e2c0972c3def9e67ff954eb17c560e474e8cf
* | util: Convert 'D1_D2_SETUP_ARGS' to a list of tuplesStephen Finucane2021-03-151-41/+44
| | | | | | | | | | | | | | | | Dicts can't have duplicate keys. Lists of tuples can. We're going to need duplicates. Change-Id: Id43ba91585160448ad9737ba958ace5163d26f3d Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
* | Revert "Map requires-python to python-requires"Stephen Finucane2021-03-151-1/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d5da2121f875109a94809eeb8aa271fd5a0b3edd. This was done incorrectly. The 'D1_D2_SETUP_ARGS' dictionary modified here is a mapping of distutils (and by extension, setuptools) supported options to their legacy distutils2 equivalents, and is used to transform the latter to the former. For example, consider the following entry: "long_description": ("metadata", "description"), This will transform an entry like so in a 'setup.cfg' file: [metadata] description = ... Into the following equivalent call to setuptools' 'setup' function: setup( ..., long_description='...', ... ) By that measure, the entry added in this change, namely: "requires_python": ("metadata", "python_requires"), Will result in a 'requires_python' argument being added to the 'setup' call. That's not what we want. Rather, we likely want to transform a '[metadata] requires_python' entry to a 'python_requires' argument to 'setup'. The change is reverted here in expectation of a forthcoming proper fix. Change-Id: I7158e75934535b80eb60d6b4b7dcef08866b5bab Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
* Dropping lower constraints testingHervé Beraud2021-03-096-47/+5
| | | | | | | | | | | | | | | | | We facing errors related to the new pip resolver, this topic was discussed on the ML and QA team proposed to to test lower-constraints [1]. I propose to drop this test because the complexity and recurring pain needed to maintain that now exceeds the benefits provided by this mechanismes. Replace assertTrue by assertIn to fix with the latest flake8 version. Add six in the documentation requirements to fix the build. Fix the conflict status with hacking. [1] http://lists.openstack.org/pipermail/openstack-discuss/2020-December/019390.html Change-Id: I580da15fefd6ad352e69749b77cc4664aef84f9c
* Adding pre-commitHervé Beraud2020-10-214-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced changes: - pre-commit config and rules - Add pre-commit to pep8 gate, Flake8 is covered in the pre-commit hooks. - Applying fixes for pre-commit compliance in all code. Also commit hash will be used instead of version tags in pre-commit to prevend arbitrary code from running in developer's machines. pre-commit will be used to: - trailing whitespace; - Replaces or checks mixed line ending (mixed-line-ending); - Forbid files which have a UTF-8 byte-order marker (check-byte-order-marker); - Checks that non-binary executables have a proper shebang (check-executables-have-shebangs); - Check for files that contain merge conflict strings (check-merge-conflict); - Check for debugger imports and py37+ breakpoint() calls in python source (debug-statements); - Attempts to load all yaml files to verify syntax (check-yaml); - Run flake8 checks (flake8) (local) For further details about tests please refer to: https://github.com/pre-commit/pre-commit-hooks Change-Id: I730018e2bf788be5ac4e993af1746296206edfc1 Signed-off-by: Moisés Guimarães de Medeiros <moguimar@redhat.com>
* Merge "Remove use_2to3 backward compat for Setuptools"5.5.1Zuul2020-10-192-2/+10
|\
| * Remove use_2to3 backward compat for SetuptoolsJeremy Stanley2020-09-192-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Odds are this was never used by any PBR-based projects, but was included from the beginning to support a feature of Setuptools for a utility which has been long since discouraged. As of Setuptools 46.2.0 and Python 3.9 it's generating deprecation warnings, and is slated for removal from the Python 3.10 standard library. https://bugs.python.org/issue40360 https://github.com/pypa/setuptools/issues/2086 Change-Id: I6972984f29413d2534d802b142fa9323a7e4a4a3
* | Merge "More easy_install.ScriptWriter.get_header()"Zuul2020-10-181-1/+5
|\ \
| * | More easy_install.ScriptWriter.get_header()Jeremy Stanley2020-09-191-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | Setuptools 12.0 deprecated easy_install.get_script_header() when it was released five years ago, and if called with PYTHONWARNINGS=error raises a deprecation exception. Switch to the preferred class method, but keep the original call as a fallback since it won't work on older Setuptools versions (such as the 3.3 shipped with Ubuntu Trusty). This continues 9a219f9a4f47243123d50d30938506bcc792e55d to remove a second call for the same deprecated function. Change-Id: I365075c2cff88283f92298ce2f5e53d263dc7f4b
* | Run tempest-full for stable/trainJeremy Stanley2020-10-161-0/+6
|/ | | | | | | | | | | | The tempest-full job runs Python 2.7 (as opposed to tempest-full-py3) so will want to install Python library packages which have been dropped in Focal in favor of their python3-.* replacements. Switch this job to use stable/train branches of required projects as they still expected 2.7 to work, and as a side effect this will cause the appropriate nodeset to be chosen automatically. Change-Id: Id95eaae9351e8664aa1fa48a7b4bf59e4c463834
* Merge "trivial: Improve logging of run commands"5.5.0Zuul2020-08-281-2/+5
|\
| * trivial: Improve logging of run commandsStephen Finucane2020-08-061-2/+5
| | | | | | | | | | Change-Id: I5ee1f506a162692fe2882651f7ab68afb441aacf Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
* | Remove bdist_wininst supportJeremy Stanley2020-08-272-10/+15
| | | | | | | | | | | | | | | | | | | | | | Odds are this was never used, but as of Python 3.8 and Setuptools 47.2 it's deprecated in favor of just using wheels for Windows platform packaging anyway. https://discuss.python.org/t/deprecate-bdist-wininst/ https://discuss.python.org/t/remove-distutils-bdist-wininst-command/ Change-Id: I3840d9fccb1f87be5c2c03470e156559c01b7cd6
* | Merge "Add Release Notes to documentation"Zuul2020-08-275-1/+11
|\ \
| * | Add Release Notes to documentationJeremy Stanley2020-08-115-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | We're building the sdist to be able to add PBR's changelog in its docs, so may as well publish the Release Notes document it builds too. Change-Id: Icd1b4ae04de8034bc15db87be457751e70e26f6d
* | | Merge "Use easy_install.ScriptWriter.get_header()"Zuul2020-08-271-1/+5
|\ \ \
| * | | Use easy_install.ScriptWriter.get_header()Jeremy Stanley2020-08-061-1/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Setuptools 12.0 deprecated easy_install.get_script_header() when it was released five years ago, and if called with PYTHONWARNINGS=error raises a deprecation exception. Switch to the preferred class method, but keep the original call as a fallback since it won't work on older Setuptools versions (such as the 3.3 shipped with Ubuntu Trusty). Change-Id: I2ba68a47dd3f309e356a6e88bf890ac2f80d99a0
* | | Merge "Cleanup old legacy devstack-gate jobs"Zuul2020-08-175-403/+0
|\ \ \
| * | | Cleanup old legacy devstack-gate jobsClark Boylan2020-08-065-403/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These jobs have been replaced with zuulv3 aware jobs. Change-Id: I36f0156b51301cdf892b980c6e689141a088cdfa Depends-On: https://review.opendev.org/745189
* | | | Increase integration test timeoutClark Boylan2020-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're timing out installing some packages and it seems we're right up against the timeout based on logs. Increase the timeout by 50% to give us a better chance of running these jobs successfully. Change-Id: I33ce50f57af2a1d366148e24b49cae5eda2d3dfb
* | | | Merge "Begin work to modernize pbr's integration testing"Zuul2020-08-104-8/+129
|\ \ \ \ | |/ / /
| * | | Begin work to modernize pbr's integration testingClark Boylan2020-08-064-8/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PBR does integration testing by installing all of openstack's python projects to ensure we can install all of them in a variety of different ways with different pip versions. Unfortunately, these jobs are still using devstack-gate. We can simplify them significantly because zuul is now doing what devstack-gate does and provides repos configured the way we want them to be. This change updates the jobs to drop devstack-gate and simply consume zuul's repo prep. A follow up will remove the old legacy jobs as they need to be removed from project-config first. Needed-By: https://review.opendev.org/745189 Change-Id: I77a38c4611dc28db79d6f25d96ad0de36b224c98
* | | | Merge "Re-add ChangeLog"Zuul2020-08-064-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Re-add ChangeLogJeremy Stanley2020-08-064-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of PBR's features is ChangeLog generation, so it only makes sense that we would include PBR's ChangeLog in published documentation too. (Also publishing a ChangeLog is helpful.) Change-Id: Ie1561c0852dfc6731c29e9202f74f0e4c4b08786
* | | | Merge "Update some url to use opendev.org"Zuul2020-08-066-9/+8
|\ \ \ \ | |/ / /
| * | | Update some url to use opendev.orgAntoine Musso2020-08-066-9/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The git web URL is now: https://opendev.org/openstack/pbr Also stop linking README.rst to no more existing history/changelog documentation page (removed by 96b84a90141). Change-Id: I56b0e2b86a7fc66c5ae25e06175033a885f500f6
* | | Merge "Support newer openstackdocstheme"Zuul2020-08-062-7/+17
|\ \ \ | |/ / |/| |
| * | Support newer openstackdocsthemeAndreas Jaeger2020-08-062-7/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | openstackdocstheme 2.2.0 introduces new variables, add them here so that both older and newer openstackdocstheme versions are supported. 2.2.0 suport the old settings but in the future those might get removed, so let's be future-proof. Since this repo is still supporting py27, we need support for older openstackdocstheme versions. Change-Id: I6ee389843d1d959cffb126e0cd56ef6ef1e2f5e1
* | Merge "Remove neutron-fwaas from the jobs' required project"Zuul2020-08-063-3/+0
|\ \
| * | Remove neutron-fwaas from the jobs' required projectSlawek Kaplonski2020-08-063-3/+0
| |/ | | | | | | | | | | | | | | Neutron-fwaas is going to be deprecated in master branch with [1]. [1] https://review.opendev.org/#/c/735828/ Change-Id: I968a719258ee9647a7d232f2e60b2054539682ec
* | Merge "Update python requires packaging metadata for package"Zuul2020-08-062-2/+2
|\ \
| * | Update python requires packaging metadata for packageMatthew Treinish2020-08-062-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The metadata field, 'python-requires' was introduced in PEP440 and appears to have superseded 'requires-python'. [1] The metadata that pbr uses for itself and it's test package was using the old incorrect field, this commit updates it to be the proper metadata to show a working example. To a certain extent it probably doesn't matter because it's very unlikely someone will try to install pbr with python 2.5, but it's more about making sure that pbr itself is leading by example and that it's own config actually works. [1] https://github.com/mtreinish/stestr/issues/292 Change-Id: I5eb14d490a3731b6b95d7a1137c33ec2d73f193f
* | Map requires-python to python-requiresMonty Taylor2020-08-061-0/+1
|/ | | | | | | | Apparently requires-python is the old value and isn't valid anymore. What people mean is python-requires. Of course, people are still using the old value. Fix it for them. Change-Id: Id49cf641f2eddac17f1b21b186aa3a150bd863f9
* Update hackingClark Boylan2020-08-054-5/+5
| | | | | | | | This allows us to run tox -epep8 on newer python versions. Fix the issues newer hacking calls out. They were complaints about indentation and ambigious l value variable names. Change-Id: I9552fba791bdf54649fbe25fc26bffdf8186ff0a
* Add support for virtualenv 20.xStephen Finucane2020-08-057-53/+78
| | | | | | | | | | | | | | | | | | | | virtualenv is undergoing a rewrite and has changed how the programmatic API works [1]. Switch to the "new way". While we're here, we also need to get Python 2.7 tests passing again. That requires dropping support for upper-constraints and using our own, limited local constraints based on supported Python versions. We also need to migrate integration tests since those run with Python 3 now. Update the scenarios for pip/setuptools in integration testing similarly. Finally clean up the installation of all devstack repos as requirements are managed different now. Instead of worrying about syncing them we use constraints. [1] https://github.com/pypa/virtualenv/issues/1585#issuecomment-585228492 Change-Id: I493e88985d2c4d09612fea4d20d8ffa20043a0cb Signed-off-by: Stephen Finucane <sfinucan@redhat.com> Depends-On: https://review.opendev.org/739014
* Merge "Switch to Ussuri jobs"5.4.5Zuul2019-12-061-2/+1
|\
| * Switch to Ussuri jobsxuanyandong2019-12-031-2/+1
| | | | | | | | Change-Id: I059ae377aed10e5dcb0e418c6aa427aca88cf9e1
View Lorry Controller Status