Extend senaite.core's buildout.base.cfg and drop the unused Travis config - #184
Open
xispa wants to merge 2 commits into
Open
Extend senaite.core's buildout.base.cfg and drop the unused Travis config#184xispa wants to merge 2 commits into
xispa wants to merge 2 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of the issue/feature this PR addresses
plone.jsonapi.core0.8.0 is published on PyPI under the PEP 625 normalized sdist filenameplone_jsonapi_core-0.8.0.tar.gz, which thesetuptools44.1.1 resolver we are pinned to on Python 2.7 cannot match against the dottedplone.jsonapi.corerequirement. The fix (afind-linksentry for the legacy dotted-name sdist attached to the GitHub release, plus an explicit version pin) was applied tosenaite.core'sbuildout.base.cfg, so every add-on that extends that file inherits it automatically.This package did not: it carried its own ~100 line copy of the base buildout, so the fix would have had to be duplicated here by hand — and the same would be true of every future change to the shared development buildout.
Rather than copy the two lines, this PR removes the duplication and extends
senaite.core'sbuildout.base.cfg, matching whatsenaite.patient,senaite.jsonapi,senaite.abx,senaite.ast,senaite.storageand the other add-ons already do.Companion PRs do the same for
senaite.app.spotlight,senaite.app.supermodel,senaite.impressandsenaite.lims, the remaining packages that still carried their own copy.While in the build configuration, this also removes the Travis CI setup. We no longer use Travis,
travis-ci.orghas been shut down, and both files have been untouched since July 2020.Current behavior before PR
buildout.cfgis a 101 line standalone config that re-declaresindex,find-links,parts,eggs,[sources],[instance],[i18ndude],[test],[omelette],[zopepy],[write_code_headers]and[versions], all near-identical tosenaite.core'sbuildout.base.cfgbut free to drift from it. It does not pick up theplone.jsonapi.core0.8.0 fix..travis.ymlandtravis.cfgare still in the repository, andREADME.mdstill renders a Travis build badge that resolves to nothing.Desired behavior after PR is merged
buildout.cfgis reduced to 12 lines: theextendsofsenaite.core'sbuildout.base.cfg,package-name, and anauto-checkoutlist that excludes this package (which is supplied bydevelop = .) — the same shape assenaite.jsonapi's config.The
plone.jsonapi.corefind-links entry and= 0.8.0pin are inherited, and future base-buildout changes arrive without a PR here.Inheriting the base rather than the local copy also changes the following development-only settings. None affect the shipped package:
[instance] wsgibecomesoff, sobin/instanceruns under ZServer instead of waitress — the same assenaite.coreand the other add-ons.[instance] eggsusesPlonerather thanPlone[archetypes].Products.Archetypes(needed byajax.py) still resolves, viasenaite.core->Products.ATContentTypes.[instance] resourcesis dropped. It pointed at aresources/directory that does not exist in this repo, so the recipe was creating an empty one and registering an empty ZCML resource directory. (Unrelated to webpack'sresources.pt, which is written into the package'sstatic/path.)update_sourcespart is dropped, sobin/update_sourcesis no longer generated.templates/update_sources.inis now unused.[versions]no longer pinssetuptools = 44.1.1/zc.buildout = 2.13.3explicitly;requirements.txtstill installs exactly those versions.[sources]loses thepushurl=git@github.com:...entries, so pushing from a checked-outsrc/sibling uses HTTPS. If we want these back, they belong inbuildout.base.cfgfor all add-ons rather than re-duplicated here..travis.yml,travis.cfgand the dead README badge are gone. The only CI in this repository is.github/workflows/jest.yml, which is untouched.--
I confirm I have tested the PR thoroughly and coded it according to PEP8
standards.