Skip to content

Commit

Permalink
Blacken noxfile.py, setup.py (via synth). (#8126)
Browse files Browse the repository at this point in the history
  • Loading branch information
yoshi-automation authored and tseaver committed May 24, 2019
1 parent 6dae20c commit e18d05b
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 28 deletions.
46 changes: 22 additions & 24 deletions irm/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@

LOCAL_DEPS = (os.path.join("..", "api_core"), os.path.join("..", "core"))

BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

if os.path.exists("samples"):
BLACK_PATHS.append("samples")


@nox.session(python="3.7")
def lint(session):
"""Run linters.
Expand All @@ -31,13 +37,7 @@ def lint(session):
serious code quality issues.
"""
session.install("flake8", "black", *LOCAL_DEPS)
session.run(
"black",
"--check",
"google",
"tests",
"docs",
)
session.run("black", "--check", *BLACK_PATHS)
session.run("flake8", "google", "tests")


Expand All @@ -52,12 +52,7 @@ def blacken(session):
check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
"""
session.install("black")
session.run(
"black",
"google",
"tests",
"docs",
)
session.run("black", *BLACK_PATHS)


@nox.session(python="3.7")
Expand Down Expand Up @@ -140,21 +135,24 @@ def cover(session):

session.run("coverage", "erase")


@nox.session(python="3.7")
def docs(session):
"""Build the docs for this library."""

session.install('-e', '.')
session.install('sphinx', 'alabaster', 'recommonmark')
session.install("-e", ".")
session.install("sphinx", "alabaster", "recommonmark")

shutil.rmtree(os.path.join('docs', '_build'), ignore_errors=True)
shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
session.run(
'sphinx-build',
'-W', # warnings as errors
'-T', # show full traceback on exception
'-N', # no colors
'-b', 'html',
'-d', os.path.join('docs', '_build', 'doctrees', ''),
os.path.join('docs', ''),
os.path.join('docs', '_build', 'html', ''),
"sphinx-build",
"-W", # warnings as errors
"-T", # show full traceback on exception
"-N", # no colors
"-b",
"html",
"-d",
os.path.join("docs", "_build", "doctrees", ""),
os.path.join("docs", ""),
os.path.join("docs", "_build", "html", ""),
)
5 changes: 4 additions & 1 deletion irm/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
description = "Stackdriver Incident Response & Managment API client library"
version = "0.1.0"
release_status = "Development Status :: 3 - Alpha"
dependencies = ["google-api-core[grpc] >= 1.6.0, < 2.0.0dev", "google-cloud-monitoring >= 0.31.1, < 0.32dev"]
dependencies = [
"google-api-core[grpc] >= 1.6.0, < 2.0.0dev",
"google-cloud-monitoring >= 0.31.1, < 0.32dev",
]

package_root = os.path.abspath(os.path.dirname(__file__))

Expand Down
6 changes: 3 additions & 3 deletions irm/synth.metadata
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"updateTime": "2019-05-21T12:22:55.758451Z",
"updateTime": "2019-05-24T12:22:38.135589Z",
"sources": [
{
"generator": {
Expand All @@ -12,8 +12,8 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "32a10f69e2c9ce15bba13ab1ff928bacebb25160",
"internalRef": "249058354"
"sha": "0537189470f04f24836d6959821c24197a0ed120",
"internalRef": "249742806"
}
},
{
Expand Down

0 comments on commit e18d05b

Please sign in to comment.