Skip to content

Commit

Permalink
Reformat with black
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisgilmerproj
chrisgilmerproj committed May 15, 2019
1 parent 55c2942 commit b21be2c
Show file tree
Hide file tree
Showing 66 changed files with 2,821 additions and 2,706 deletions.
118 changes: 75 additions & 43 deletions brew/cli/abv.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@
from brew.utilities.sugar import refractometer_adjustment


def get_abv(og, fg,
og_temp=HYDROMETER_ADJUSTMENT_TEMP,
fg_temp=HYDROMETER_ADJUSTMENT_TEMP,
alternative=False,
refractometer=False,
units=IMPERIAL_UNITS,
verbose=False):
def get_abv(
og,
fg,
og_temp=HYDROMETER_ADJUSTMENT_TEMP,
fg_temp=HYDROMETER_ADJUSTMENT_TEMP,
alternative=False,
refractometer=False,
units=IMPERIAL_UNITS,
verbose=False,
):
"""
Get Alcohol by Volume for CLI Utility
Expand All @@ -41,8 +44,9 @@ def get_abv(og, fg,
raise Exception(u"Original Gravity must be higher than Final Gravity")

if units not in [IMPERIAL_UNITS, SI_UNITS]:
raise Exception(u"Units must be in either {} or {}".format(IMPERIAL_UNITS, # noqa
SI_UNITS))
raise Exception(
u"Units must be in either {} or {}".format(IMPERIAL_UNITS, SI_UNITS) # noqa
)

# Adjust the gravity based on temperature
og = hydrometer_adjustment(og, og_temp, units=units)
Expand All @@ -60,45 +64,70 @@ def get_abv(og, fg,

if verbose:
out = []
t_unit = u'F' if units == IMPERIAL_UNITS else u'C'
t_unit = u"F" if units == IMPERIAL_UNITS else u"C"
out.append(u"OG : {:0.3f}".format(og))
out.append(u"OG Adj : {:0.3f}".format(og))
out.append(u"OG Temp: {:0.2f} {}".format(og_temp, t_unit))
out.append(u"FG : {:0.3f}".format(fg))
out.append(u"FG Adj : {:0.3f}".format(fg))
out.append(u"FG Temp: {:0.2f} {}".format(fg_temp, t_unit))
out.append(u"ABV : {:0.2%}".format(abv))
return u'\n'.join(out)
return u"\n".join(out)
else:
return abv


def get_parser():
parser = argparse.ArgumentParser(description=u'ABV Calculator')
parser.add_argument(u'-o', u'--og', metavar=u'O', type=float,
required=True,
help=u'Original Gravity')
parser.add_argument(u'-f', u'--fg', metavar=u'F', type=float,
required=True,
help=u'Final Gravity')
parser.add_argument(u'--og-temp', metavar=u'T', type=float,
default=HYDROMETER_ADJUSTMENT_TEMP,
help=u'Original Gravity Temperature (default: %(default)s)') # noqa
parser.add_argument(u'--fg-temp', metavar=u'T', type=float,
default=HYDROMETER_ADJUSTMENT_TEMP,
help=u'Final Gravity Temperature (default: %(default)s)') # noqa
parser.add_argument(u'-a', u'--alternative', action=u'store_true',
default=False,
help=u'Use alternative ABV equation')
parser.add_argument(u'-r', u'--refractometer', action=u'store_true',
default=False,
help=u'Adjust the Final Gravity if using a Refractometer reading') # noqa
parser.add_argument(u'--units', metavar=u"U", type=str,
default=IMPERIAL_UNITS,
help=u'Units to use (default: %(default)s)')
parser.add_argument(u'-v', u'--verbose', action=u'store_true',
default=False,
help=u'Verbose Output')
parser = argparse.ArgumentParser(description=u"ABV Calculator")
parser.add_argument(
u"-o",
u"--og",
metavar=u"O",
type=float,
required=True,
help=u"Original Gravity",
)
parser.add_argument(
u"-f", u"--fg", metavar=u"F", type=float, required=True, help=u"Final Gravity"
)
parser.add_argument(
u"--og-temp",
metavar=u"T",
type=float,
default=HYDROMETER_ADJUSTMENT_TEMP,
help=u"Original Gravity Temperature (default: %(default)s)",
) # noqa
parser.add_argument(
u"--fg-temp",
metavar=u"T",
type=float,
default=HYDROMETER_ADJUSTMENT_TEMP,
help=u"Final Gravity Temperature (default: %(default)s)",
) # noqa
parser.add_argument(
u"-a",
u"--alternative",
action=u"store_true",
default=False,
help=u"Use alternative ABV equation",
)
parser.add_argument(
u"-r",
u"--refractometer",
action=u"store_true",
default=False,
help=u"Adjust the Final Gravity if using a Refractometer reading",
) # noqa
parser.add_argument(
u"--units",
metavar=u"U",
type=str,
default=IMPERIAL_UNITS,
help=u"Units to use (default: %(default)s)",
)
parser.add_argument(
u"-v", u"--verbose", action=u"store_true", default=False, help=u"Verbose Output"
)
return parser


Expand All @@ -110,13 +139,16 @@ def main(parser_fn=get_parser, parser_kwargs=None):
parser = parser_fn(**parser_kwargs)
args = parser.parse_args()
try:
out = get_abv(args.og, args.fg,
og_temp=args.og_temp,
fg_temp=args.fg_temp,
alternative=args.alternative,
refractometer=args.refractometer,
units=args.units,
verbose=args.verbose)
out = get_abv(
args.og,
args.fg,
og_temp=args.og_temp,
fg_temp=args.fg_temp,
alternative=args.alternative,
refractometer=args.refractometer,
units=args.units,
verbose=args.verbose,
)
if args.verbose:
print(out)
else:
Expand Down
35 changes: 22 additions & 13 deletions brew/cli/gravity_volume.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,26 @@ def get_gravity(original_volume, final_volume, gravity):


def get_parser():
parser = argparse.ArgumentParser(description=u'Gravity-Volume Conversion')
parser.add_argument(u'-o', u'--original-volume', metavar=u'V', type=float,
required=True, help=u'Original Volume')
parser.add_argument(u'-f', u'--final-volume', metavar=u'V', type=float,
required=True, help=u'Final Volume')
parser.add_argument(u'-g', u'--gravity', metavar=u'G', type=float,
required=True, help=u'Gravity')
parser = argparse.ArgumentParser(description=u"Gravity-Volume Conversion")
parser.add_argument(
u"-o",
u"--original-volume",
metavar=u"V",
type=float,
required=True,
help=u"Original Volume",
)
parser.add_argument(
u"-f",
u"--final-volume",
metavar=u"V",
type=float,
required=True,
help=u"Final Volume",
)
parser.add_argument(
u"-g", u"--gravity", metavar=u"G", type=float, required=True, help=u"Gravity"
)
return parser


Expand All @@ -31,14 +44,10 @@ def main(parser_fn=get_parser, parser_kwargs=None):
else:
parser = parser_fn(**parser_kwargs)
args = parser.parse_args()
if not all([args.original_volume,
args.final_volume,
args.gravity]):
if not all([args.original_volume, args.final_volume, args.gravity]):
print("Please provide all arguments")
sys.exit(1)
out = get_gravity(args.original_volume,
args.final_volume,
args.gravity)
out = get_gravity(args.original_volume, args.final_volume, args.gravity)
print("{:0.3f}".format(out))


Expand Down
42 changes: 27 additions & 15 deletions brew/cli/sugar.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,42 @@ def get_sugar_conversion(brix_in, plato_in, sg_in, sugar_out):
brix = round(brix, 1)
plato = round(plato, 1)
sg = round(sg, 3)
if sugar_out and sugar_out in [u'b', u'p', u's']:
if sugar_out == u'b':
if sugar_out and sugar_out in [u"b", u"p", u"s"]:
if sugar_out == u"b":
return brix
elif sugar_out == u'p':
elif sugar_out == u"p":
return plato
elif sugar_out == u's':
elif sugar_out == u"s":
return sg
else:
out = textwrap.dedent(u"""\
out = textwrap.dedent(
u"""\
SG\tPlato\tBrix
{:0.3f}\t{:0.1f}\t{:0.1f}""".format(sg, plato, brix))
{:0.3f}\t{:0.1f}\t{:0.1f}""".format(
sg, plato, brix
)
)
return out


def get_parser():
parser = argparse.ArgumentParser(description=u'Sugar Conversion')
parser.add_argument(u'-b', u'--brix', metavar=u'B', type=float,
help=u'Degrees Brix')
parser.add_argument(u'-p', u'--plato', metavar=u'P', type=float,
help=u'Degrees Plato')
parser.add_argument(u'-s', u'--sg', metavar=u'S', type=float,
help=u'Specific Gravity')
parser.add_argument(u'-o', u'--out', metavar=u'O', type=str,
help=u'Desired Output (b, p, s accepted)')
parser = argparse.ArgumentParser(description=u"Sugar Conversion")
parser.add_argument(
u"-b", u"--brix", metavar=u"B", type=float, help=u"Degrees Brix"
)
parser.add_argument(
u"-p", u"--plato", metavar=u"P", type=float, help=u"Degrees Plato"
)
parser.add_argument(
u"-s", u"--sg", metavar=u"S", type=float, help=u"Specific Gravity"
)
parser.add_argument(
u"-o",
u"--out",
metavar=u"O",
type=str,
help=u"Desired Output (b, p, s accepted)",
)
return parser


Expand Down
16 changes: 11 additions & 5 deletions brew/cli/temp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@ def get_temp_conversion(fahrenheit, celsius):


def get_parser():
parser = argparse.ArgumentParser(description=u'Temperature Conversion')
parser.add_argument(u'-c', u'--celsius', metavar=u'C', type=float,
help=u'Temperature in Celsius')
parser.add_argument(u'-f', u'--fahrenheit', metavar=u'F', type=float,
help=u'Temperature in Fahrenheit')
parser = argparse.ArgumentParser(description=u"Temperature Conversion")
parser.add_argument(
u"-c", u"--celsius", metavar=u"C", type=float, help=u"Temperature in Celsius"
)
parser.add_argument(
u"-f",
u"--fahrenheit",
metavar=u"F",
type=float,
help=u"Temperature in Fahrenheit",
)
return parser


Expand Down
Loading

0 comments on commit b21be2c

Please sign in to comment.