Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove unnecessary dependency on libcst and scripts #220

Merged
merged 8 commits into from Oct 23, 2020
7 changes: 6 additions & 1 deletion scripts/fixup_admin_v1_keywords.py
Expand Up @@ -17,7 +17,12 @@

import argparse
import os
import libcst as cst

try:
import libcst as cst
except ImportError as exception:
raise ImportError(exception.__class__.__name__ + ": " + exception.msg)
tseaver marked this conversation as resolved.
Show resolved Hide resolved

import pathlib
import sys
from typing import (Any, Callable, Dict, List, Sequence, Tuple)
Expand Down
9 changes: 7 additions & 2 deletions scripts/fixup_firestore_admin_v1_keywords.py
Expand Up @@ -7,7 +7,7 @@
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#nox
tseaver marked this conversation as resolved.
Show resolved Hide resolved
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -17,7 +17,12 @@

import argparse
import os
import libcst as cst

try:
import libcst as cst
except ImportError as exception:
raise ImportError(exception.__class__.__name__ + ": " + exception.msg)
tseaver marked this conversation as resolved.
Show resolved Hide resolved

import pathlib
import sys
from typing import (Any, Callable, Dict, List, Sequence, Tuple)
Expand Down
7 changes: 6 additions & 1 deletion scripts/fixup_firestore_v1_keywords.py
Expand Up @@ -17,7 +17,12 @@

import argparse
import os
import libcst as cst

try:
import libcst as cst
except ImportError as exception:
raise ImportError(exception.__class__.__name__ + ": " + exception.msg)

tseaver marked this conversation as resolved.
Show resolved Hide resolved
import pathlib
import sys
from typing import (Any, Callable, Dict, List, Sequence, Tuple)
Expand Down
5 changes: 0 additions & 5 deletions setup.py
Expand Up @@ -28,7 +28,6 @@
"google-api-core[grpc] >= 1.22.1, < 2.0.0dev",
"google-cloud-core >= 1.4.1, < 2.0dev",
"pytz",
"libcst >= 0.2.5",
"proto-plus >= 1.3.0",
]
extras = {}
Expand Down Expand Up @@ -80,10 +79,6 @@
install_requires=dependencies,
extras_require=extras,
python_requires=">=3.6",
scripts=[
"scripts/fixup_firestore_v1_keywords.py",
"scripts/fixup_admin_v1_keywords.py",
],
tseaver marked this conversation as resolved.
Show resolved Hide resolved
include_package_data=True,
zip_safe=False,
)
11 changes: 9 additions & 2 deletions synth.py
Expand Up @@ -38,7 +38,11 @@
s.move(
library / f"google/cloud/firestore_{version}",
f"google/cloud/firestore_{version}",
excludes=[library / f"google/cloud/firestore_{version}/__init__.py"],
excludes=[
library / f"google/cloud/firestore_{version}/__init__.py",
"scripts/fixup_firestore_v1_keywords.py"
clear
],
tseaver marked this conversation as resolved.
Show resolved Hide resolved
)

s.move(
Expand All @@ -60,7 +64,10 @@
s.move(
library / f"google/cloud/firestore_admin_{version}",
f"google/cloud/firestore_admin_{version}",
excludes=[library / f"google/cloud/admin_{version}/__init__.py"],
excludes=[
library / f"google/cloud/admin_{version}/__init__.py",
"scripts/fixup_admin_v1_keywords.py"
],
tseaver marked this conversation as resolved.
Show resolved Hide resolved
)
s.move(library / f"tests", f"tests")
s.move(library / "scripts")
Expand Down