Scrapi src rework

agutta · Aug 10, 2021 · 7252a78 · 7252a78
1 parent f19eeef
commit 7252a78
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 29 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,22 +19,10 @@ image: python:3.7.9
 variables:
     PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
 
-# Pip's cache doesn't store the python packages
-# https://pip.pypa.io/en/stable/reference/pip_install/#caching
-#
-# If you want to also cache the installed packages, you have to install
-# them in a virtualenv and cache it as well.
-cache:
-    key: ${CI_JOB_NAME}
-    paths:
-        - .cache/pip
-        - venv/
-
 before_script:
-    - python -V  # Print out python version for debugging
+    - python -V 
     - python -m venv venv
     - source venv/bin/activate
-    # - cp config.yaml.example config.yaml
 
 # Job to run if there's nothing to lint or test.
 noop:
@@ -64,6 +52,7 @@ linting:
     script:
         # - chmod +x tests/license/license_check.sh
         # - tests/license/license_check.sh
+        - pip install --upgrade pip
         - pip install pylint==2.8.3
         - pylint --jobs=0 $(git ls-files '*.py')
 

diff --git a/.pylintrc b/.pylintrc
@@ -31,12 +31,6 @@ jobs=4
 # active Python interpreter and may run arbitrary code.
 unsafe-load-any-extension=no
 
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=
-
-
 [MESSAGES CONTROL]
 
 # Only show warnings with the listed confidence levels. Leave empty to show

diff --git a/pyproject.toml b/pyproject.toml
@@ -30,9 +30,6 @@ exclude = '''
 
 
 # Build system information below.
-# NOTE: You don't need this in your own Black configuration.
-
 [build-system]
-requires = ["setuptools>=41.0", "setuptools-scm", "wheel"]
+requires = ["setuptools>=42", "setuptools-scm", "wheel"]
 build-backend = "setuptools.build_meta"
-
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,2 @@
-[yapf]
-ignore = E226,E302
-max-line-length = 130
-
-
+[metadata]
+license_files = LICENSE.txt
diff --git a/setup.py b/setup.py
@@ -14,6 +14,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import pathlib
 from setuptools import setup, find_packages
 
-setup(name="dfcx", packages=find_packages())
+here = pathlib.Path(__file__).parent.resolve()
+
+long_description = (here / 'README.md').read_text(encoding='utf-8')
+
+setup(
+    name='dfcx-scrapi',
+    version='1.0.0',
+    description='A high level scripting API for bot builders, developers, and\
+      maintainers.',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    url='https://github.com/GoogleCloudPlatform/dfcx-scrapi',
+    author='Patrick Marlow',
+    author_email='[email protected]',
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Bot Building',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+    ],
+    keywords='dialogflow, cx, google, bot, chatbot, intent, dfcx, entity',
+    package_dir={'':'src'},
+    packages=find_packages(where='src'),
+    python_requires='>=3.6, <4',
+    install_requires=['google-cloud-dialogflow-cx']
+)
diff --git a/__init__.py → src/dfcx_scrapi/__init__.py b/__init__.py → src/dfcx_scrapi/__init__.py
diff --git a/builders/intent.py → src/dfcx_scrapi/builders/intent.py b/builders/intent.py → src/dfcx_scrapi/builders/intent.py
diff --git a/core/__init__.py → src/dfcx_scrapi/core/__init__.py b/core/__init__.py → src/dfcx_scrapi/core/__init__.py
diff --git a/core/agents.py → src/dfcx_scrapi/core/agents.py b/core/agents.py → src/dfcx_scrapi/core/agents.py
diff --git a/core/conversation.py → src/dfcx_scrapi/core/conversation.py b/core/conversation.py → src/dfcx_scrapi/core/conversation.py
diff --git a/core/entity_types.py → src/dfcx_scrapi/core/entity_types.py b/core/entity_types.py → src/dfcx_scrapi/core/entity_types.py
diff --git a/core/experiments.py → src/dfcx_scrapi/core/experiments.py b/core/experiments.py → src/dfcx_scrapi/core/experiments.py
diff --git a/core/flows.py → src/dfcx_scrapi/core/flows.py b/core/flows.py → src/dfcx_scrapi/core/flows.py
diff --git a/core/intents.py → src/dfcx_scrapi/core/intents.py b/core/intents.py → src/dfcx_scrapi/core/intents.py
diff --git a/core/operations.py → src/dfcx_scrapi/core/operations.py b/core/operations.py → src/dfcx_scrapi/core/operations.py
diff --git a/core/pages.py → src/dfcx_scrapi/core/pages.py b/core/pages.py → src/dfcx_scrapi/core/pages.py
diff --git a/core/scrapi_base.py → src/dfcx_scrapi/core/scrapi_base.py b/core/scrapi_base.py → src/dfcx_scrapi/core/scrapi_base.py
diff --git a/core/sessions.py → src/dfcx_scrapi/core/sessions.py b/core/sessions.py → src/dfcx_scrapi/core/sessions.py
diff --git a/core/transition_route_groups.py → ...cx_scrapi/core/transition_route_groups.py b/core/transition_route_groups.py → ...cx_scrapi/core/transition_route_groups.py
diff --git a/core/webhooks.py → src/dfcx_scrapi/core/webhooks.py b/core/webhooks.py → src/dfcx_scrapi/core/webhooks.py
diff --git a/soop/__init__.py → src/dfcx_scrapi/soop/__init__.py b/soop/__init__.py → src/dfcx_scrapi/soop/__init__.py
diff --git a/soop/project.py → src/dfcx_scrapi/soop/project.py b/soop/project.py → src/dfcx_scrapi/soop/project.py
diff --git a/tools/__init__.py → src/dfcx_scrapi/tools/__init__.py b/tools/__init__.py → src/dfcx_scrapi/tools/__init__.py
diff --git a/tools/change_history.py → src/dfcx_scrapi/tools/change_history.py b/tools/change_history.py → src/dfcx_scrapi/tools/change_history.py
diff --git a/tools/copy_util.py → src/dfcx_scrapi/tools/copy_util.py b/tools/copy_util.py → src/dfcx_scrapi/tools/copy_util.py
diff --git a/tools/dataframe_functions.py → src/dfcx_scrapi/tools/dataframe_functions.py b/tools/dataframe_functions.py → src/dfcx_scrapi/tools/dataframe_functions.py
diff --git a/tools/maker_util.py → src/dfcx_scrapi/tools/maker_util.py b/tools/maker_util.py → src/dfcx_scrapi/tools/maker_util.py
diff --git a/tools/search_util.py → src/dfcx_scrapi/tools/search_util.py b/tools/search_util.py → src/dfcx_scrapi/tools/search_util.py
diff --git a/tools/stats_util.py → src/dfcx_scrapi/tools/stats_util.py b/tools/stats_util.py → src/dfcx_scrapi/tools/stats_util.py
diff --git a/tools/validation_kit.py → src/dfcx_scrapi/tools/validation_kit.py b/tools/validation_kit.py → src/dfcx_scrapi/tools/validation_kit.py
diff --git a/tools/webhook_utils.py → src/dfcx_scrapi/tools/webhook_utils.py b/tools/webhook_utils.py → src/dfcx_scrapi/tools/webhook_utils.py