Skip to content

Commit

Permalink
Ran black.
Browse files Browse the repository at this point in the history
Black sees a SyntaxError in changelog.py, so that one is not changed.
  • Loading branch information
mauritsvanrees committed Aug 16, 2019
1 parent b51284a commit f0d5021
Show file tree
Hide file tree
Showing 10 changed files with 335 additions and 351 deletions.
112 changes: 65 additions & 47 deletions bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

tmpeggs = tempfile.mkdtemp()

usage = '''\
usage = """\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
Bootstraps a buildout-based project.
Expand All @@ -37,30 +37,41 @@
Note that by using --find-links to point to local resources, you can keep
this script from going over the network.
'''
"""

parser = OptionParser(usage=usage)
parser.add_option("-v", "--version", help="use a specific zc.buildout version")

parser.add_option("-t", "--accept-buildout-test-releases",
dest='accept_buildout_test_releases',
action="store_true", default=False,
help=("Normally, if you do not specify a --version, the "
"bootstrap script and buildout gets the newest "
"*final* versions of zc.buildout and its recipes and "
"extensions for you. If you use this flag, "
"bootstrap and buildout will get the newest releases "
"even if they are alphas or betas."))
parser.add_option("-c", "--config-file",
help=("Specify the path to the buildout configuration "
"file to be used."))
parser.add_option("-f", "--find-links",
help=("Specify a URL to search for buildout releases"))
parser.add_option("--allow-site-packages",
action="store_true", default=False,
help=("Let bootstrap.py use existing site packages"))
parser.add_option("--setuptools-version",
help="use a specific setuptools version")
parser.add_option(
"-t",
"--accept-buildout-test-releases",
dest="accept_buildout_test_releases",
action="store_true",
default=False,
help=(
"Normally, if you do not specify a --version, the "
"bootstrap script and buildout gets the newest "
"*final* versions of zc.buildout and its recipes and "
"extensions for you. If you use this flag, "
"bootstrap and buildout will get the newest releases "
"even if they are alphas or betas."
),
)
parser.add_option(
"-c",
"--config-file",
help=("Specify the path to the buildout configuration " "file to be used."),
)
parser.add_option(
"-f", "--find-links", help=("Specify a URL to search for buildout releases")
)
parser.add_option(
"--allow-site-packages",
action="store_true",
default=False,
help=("Let bootstrap.py use existing site packages"),
)
parser.add_option("--setuptools-version", help="use a specific setuptools version")


options, args = parser.parse_args()
Expand All @@ -77,25 +88,26 @@
from urllib2 import urlopen

ez = {}
exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
exec(urlopen("https://bootstrap.pypa.io/ez_setup.py").read(), ez)

if not options.allow_site_packages:
# ez_setup imports site, which adds site packages
# this will remove them from the path to ensure that incompatible versions
# of setuptools are not in the path
import site

# inside a virtualenv, there is no 'getsitepackages'.
# We can't remove these reliably
if hasattr(site, 'getsitepackages'):
if hasattr(site, "getsitepackages"):
for sitepackage_path in site.getsitepackages():
sys.path[:] = [x for x in sys.path if sitepackage_path not in x]

setup_args = dict(to_dir=tmpeggs, download_delay=0)

if options.setuptools_version is not None:
setup_args['version'] = options.setuptools_version
setup_args["version"] = options.setuptools_version

ez['use_setuptools'](**setup_args)
ez["use_setuptools"](**setup_args)
import setuptools
import pkg_resources

Expand All @@ -110,41 +122,47 @@

ws = pkg_resources.working_set

cmd = [sys.executable, '-c',
'from setuptools.command.easy_install import main; main()',
'-mZqNxd', tmpeggs]
cmd = [
sys.executable,
"-c",
"from setuptools.command.easy_install import main; main()",
"-mZqNxd",
tmpeggs,
]

find_links = os.environ.get(
'bootstrap-testing-find-links',
options.find_links or
('http://downloads.buildout.org/'
if options.accept_buildout_test_releases else None)
)
"bootstrap-testing-find-links",
options.find_links
or (
"http://downloads.buildout.org/"
if options.accept_buildout_test_releases
else None
),
)
if find_links:
cmd.extend(['-f', find_links])
cmd.extend(["-f", find_links])

setuptools_path = ws.find(
pkg_resources.Requirement.parse('setuptools')).location
setuptools_path = ws.find(pkg_resources.Requirement.parse("setuptools")).location

requirement = 'zc.buildout'
requirement = "zc.buildout"
version = options.version
if version is None and not options.accept_buildout_test_releases:
# Figure out the most recent final version of zc.buildout.
import setuptools.package_index
_final_parts = '*final-', '*final'

_final_parts = "*final-", "*final"

def _final_version(parsed_version):
try:
return not parsed_version.is_prerelease
except AttributeError:
# Older setuptools
for part in parsed_version:
if (part[:1] == '*') and (part not in _final_parts):
if (part[:1] == "*") and (part not in _final_parts):
return False
return True

index = setuptools.package_index.PackageIndex(
search_path=[setuptools_path])
index = setuptools.package_index.PackageIndex(search_path=[setuptools_path])
if find_links:
index.add_find_links((find_links,))
req = pkg_resources.Requirement.parse(requirement)
Expand All @@ -163,13 +181,13 @@ def _final_version(parsed_version):
best.sort()
version = best[-1].version
if version:
requirement = '=='.join((requirement, version))
requirement = "==".join((requirement, version))
cmd.append(requirement)

import subprocess

if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
raise Exception(
"Failed to execute command:\n%s" % repr(cmd)[1:-1])
raise Exception("Failed to execute command:\n%s" % repr(cmd)[1:-1])

######################################################################
# Import and run buildout
Expand All @@ -178,12 +196,12 @@ def _final_version(parsed_version):
ws.require(requirement)
import zc.buildout.buildout

if not [a for a in args if '=' not in a]:
args.append('bootstrap')
if not [a for a in args if "=" not in a]:
args.append("bootstrap")

# if -c was provided, we push it back into args for buildout' main function
if options.config_file is not None:
args[0:0] = ['-c', options.config_file]
args[0:0] = ["-c", options.config_file]

zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
2 changes: 1 addition & 1 deletion plone/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
__import__('pkg_resources').declare_namespace(__name__)
__import__("pkg_resources").declare_namespace(__name__)
54 changes: 24 additions & 30 deletions plone/releaser/__init__.py
Original file line number Diff line number Diff line change
@@ -1,44 +1,38 @@
# -*- coding: utf-8 -*-
THIRD_PARTY_PACKAGES = (
'Zope2',
'ZODB3',
'txtfilter',
'Products.CMFActionIcons',
'Products.CMFCalendar',
'Products.CMFCore',
'Products.CMFDefault',
'Products.CMFTopic',
'Products.CMFUid',
'Products.DCWorkflow',
'Products.GenericSetup',
'Products.GroupUserFolder',
'Products.PluggableAuthService',
'Products.PluginRegistry',
'Products.ZCatalog',
"Zope2",
"ZODB3",
"txtfilter",
"Products.CMFActionIcons",
"Products.CMFCalendar",
"Products.CMFCore",
"Products.CMFDefault",
"Products.CMFTopic",
"Products.CMFUid",
"Products.DCWorkflow",
"Products.GenericSetup",
"Products.GroupUserFolder",
"Products.PluggableAuthService",
"Products.PluginRegistry",
"Products.ZCatalog",
)

IGNORED_PACKAGES = (
'plone.releaser',
)
IGNORED_PACKAGES = ("plone.releaser",)

ALWAYS_CHECKED_OUT = (
'Plone',
'Products.CMFPlone',
'plone.app.upgrade',
'plone.app.locales',
"Plone",
"Products.CMFPlone",
"plone.app.upgrade",
"plone.app.locales",
)

# Upon checking a package...
# ... ask every time if an action should be performed
ACTION_INTERACTIVE = 'interactive'
ACTION_INTERACTIVE = "interactive"
# ... don't ask anything and perform all actions
ACTION_BATCH = 'batch'
ACTION_BATCH = "batch"
# ... don't ask anything *AND* don't make any action, just show the status
# of the package
ACTION_REPORT = 'report'
ACTION_REPORT = "report"

PACKAGE_ACTIONS = (
ACTION_BATCH,
ACTION_INTERACTIVE,
ACTION_REPORT,
)
PACKAGE_ACTIONS = (ACTION_BATCH, ACTION_INTERACTIVE, ACTION_REPORT)

0 comments on commit f0d5021

Please sign in to comment.