From 93985573065442d8273c760d93fe157cdf952c1a Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Fri, 29 Oct 2021 18:42:17 +0500 Subject: [PATCH 1/2] build: Replace Travis with GitHub CI --- .github/workflows/ci.yml | 44 +++ .github/workflows/pypi-publish.yml | 30 +++ .travis.yml | 30 --- Makefile | 3 +- README.rst | 8 +- dbt_schema_builder/builder.py | 8 +- pylintrc | 403 +++++++++++++++------------- requirements/base.txt | 35 +-- requirements/{travis.in => ci.in} | 2 +- requirements/{travis.txt => ci.txt} | 22 +- requirements/constraints.txt | 2 +- requirements/dev.in | 2 +- requirements/dev.txt | 102 +++---- requirements/doc.txt | 46 ++-- requirements/pip-tools.txt | 4 +- requirements/pip.in | 5 + requirements/pip.txt | 14 + requirements/quality.txt | 50 ++-- requirements/test.txt | 40 ++- setup.py | 3 +- 20 files changed, 448 insertions(+), 405 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/pypi-publish.yml delete mode 100644 .travis.yml rename requirements/{travis.in => ci.in} (75%) rename requirements/{travis.txt => ci.txt} (69%) create mode 100644 requirements/pip.in create mode 100644 requirements/pip.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..6a28375 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,44 @@ +name: Python CI + +on: + push: + branches: + - master + pull_request: + branches: + - '**' + +jobs: + run_tests: + name: Tests + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ ubuntu-20.04 ] + python-version: [ 3.8 ] + toxenv: [ py38,quality,docs ] + + steps: + - name: Checkout Repo + uses: actions/checkout@v2 + - name: setup python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Install pip + run: pip install -r requirements/pip.txt + + - name: Install dependencies + run: pip install -r requirements/ci.txt + + - name: Run Tests + env: + TOXENV: ${{ matrix.toxenv }} + run: tox + + - name: Run Coverage + if: matrix.toxenv=='py38' + uses: codecov/codecov-action@v2 + with: + fail_ci_if_error: true diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml new file mode 100644 index 0000000..871631e --- /dev/null +++ b/.github/workflows/pypi-publish.yml @@ -0,0 +1,30 @@ +name: Publish package to PyPI + +on: + push: + tags: + - '*' + +jobs: + push: + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: setup python + uses: actions/setup-python@v2 + with: + python-version: 3.8 + + - name: Install pip + run: pip install -r requirements/pip.txt + + - name: Build package + run: python setup.py sdist bdist_wheel + + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@master + with: + user: __token__ + password: ${{ secrets.PYPI_UPLOAD_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d522380..0000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: python -matrix: - include: - - python: 3.6 - env: TOXENV=py36 - - python: 3.8 - env: TOXENV=py38 - - python: 3.6 - env: TOXENV=quality - - python: 3.6 - env: TOXENV=docs -cache: -- pip -before_install: -- pip install --upgrade pip -install: -- pip install -r requirements/travis.txt -script: -- tox -after_success: -- codecov -deploy: - provider: pypi - user: edx - distributions: sdist bdist_wheel - on: - tags: true - condition: "$TOXENV = quality" - password: - secure: CP+TNlFskXDtTHfu9sJiEkbpnw5CZaaiLcvZ7W1mh0Goj32dTYoaSbk+PdTm515+RAYDz76MitG/zvZzzII/l6VZaGmZhJl4DSFSenl5vEfuThdDZG4M3Gx2Qa/J4ZCPTUEXDDF7DawXsbozDBmGOeBWeL/pDn7JiUc2idOtd+FCO3lMRtj0XsAmy2/Hc/De3HpV0IHGGK2sD77U3Av3tKJcVitr1NOp4/f+uKV1dTFOFtb238opEoPjNkpcMAYKbGj3DLGsyNyHllEqN440clqwh4j0fdGRNmJWi/24ZCYjL0U3xMfwqJypqxmOlt6r7DJGZtVDX3A4UN3D01ZSnIpa8BozuSDxkUpiC7ZBu3h/EFdW6IXSxC5y7bEN1FXsKk13adzgRu1r/ECR4JvNo5eE4qtoLsE0hefW6M51TiJarBGvZA8ZyTAvUp5UbH9VCKGV8VQI/rFzqJxGkHtExiXOTK+HRFNiEmLWTyTydqKG1zKz5OHaZejMDVK1PjYjgPMmui4fNpAn7ytUWBVbkbRWssz6WCYfrs34O1fF48EbgveAO8Mg/Br0yY7jfsRnJItNq2okz3XLWLt8JPxSTNohFtATy5KFHxg6r4w1JDX3EiIjx/5N388gKM3fA/5CAvM/j9aAUYFqjV4Nh5xh72eOXBqWRdGyjd0MqA6+ck0= diff --git a/Makefile b/Makefile index 96243db..de2aa87 100644 --- a/Makefile +++ b/Makefile @@ -36,13 +36,14 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -r requirements/pip-tools.txt # Make sure to compile files after any other files they include! + $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in pip install -r requirements/pip-tools.txt $(PIP_COMPILE) -o requirements/base.txt requirements/base.in $(PIP_COMPILE) -o requirements/test.txt requirements/test.in $(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in $(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in - $(PIP_COMPILE) -o requirements/travis.txt requirements/travis.in + $(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in $(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in quality: ## check coding style with pycodestyle and pylint diff --git a/README.rst b/README.rst index 8ba3a67..cd58f69 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ dbt-schema-builder ============================= -|pypi-badge| |travis-badge| |codecov-badge| |pyversions-badge| +|pypi-badge| |ci-badge| |codecov-badge| |pyversions-badge| |license-badge| The Schema Builder tool is used to create dbt schema files, sql models, and @@ -83,9 +83,9 @@ For more information about these options, see the `Getting Help`_ page. :target: https://pypi.python.org/pypi/dbt-schema-builder/ :alt: PyPI -.. |travis-badge| image:: https://travis-ci.com/edx/dbt-schema-builder.svg?branch=main - :target: https://travis-ci.com/edx/dbt-schema-builder - :alt: Travis +.. |ci-badge| image:: https://github.com/edx/dbt-schema-builder/workflows/Python%20CI/badge.svg?branch=master + :target: https://github.com/edx/dbt-schema-builder/actions?query=workflow%3A%22Python+CI%22 + :alt: GitHub CI .. |codecov-badge| image:: https://codecov.io/github/edx/dbt-schema-builder/coverage.svg?branch=main :target: https://codecov.io/github/edx/dbt-schema-builder?branch=main diff --git a/dbt_schema_builder/builder.py b/dbt_schema_builder/builder.py index 8c5cef7..1422085 100644 --- a/dbt_schema_builder/builder.py +++ b/dbt_schema_builder/builder.py @@ -6,6 +6,7 @@ import re import string +import dbt.utils import yaml from dbt.config import RuntimeConfig from dbt.exceptions import DatabaseException @@ -13,7 +14,6 @@ from dbt.logger import log_manager from dbt.task.compile import CompileTask from dbt.task.generate import get_adapter -import dbt.utils from .app import App from .queries import COLUMN_NAME_FILTER, GET_RELATIONS_BY_SCHEMA_AND_START_LETTER_SQL, GET_RELATIONS_BY_SCHEMA_SQL @@ -86,7 +86,9 @@ def fetch_full_catalog(self, adapter, source_database, schema, banned_column_nam ) from e catalog_data = [ - dict(zip(catalog_table.column_names, map(dbt.utils._coerce_decimal, row))) + dict( + zip(catalog_table.column_names, map(dbt.utils._coerce_decimal, row)) # pylint: disable=protected-access + ) for row in catalog_table ] @@ -133,7 +135,7 @@ def fetch_catalog_by_letter(self, adapter, source_database, schema, banned_colum for letter in all_letters: catalog_data.extend( [ - dict(zip(letter.column_names, map(_coerce_decimal, row))) + dict(zip(letter.column_names, map(_coerce_decimal, row))) # pylint: disable=undefined-variable for row in letter ] ) diff --git a/pylintrc b/pylintrc index 5030a12..7bf1ad2 100644 --- a/pylintrc +++ b/pylintrc @@ -2,12 +2,16 @@ # ** DO NOT EDIT THIS FILE ** # *************************** # -# This file was generated by edx-lint: http://github.com/edx/edx-lint +# This file was generated by edx-lint: https://github.com/edx/edx-lint # # If you want to change this file, you have two choices, depending on whether # you want to make a local change that applies only to this repo, or whether # you want to make a central change that applies to all repos using edx-lint. # +# Note: If your pylintrc file is simply out-of-date relative to the latest +# pylintrc in edx-lint, ensure you have the latest edx-lint installed +# and then follow the steps for a "LOCAL CHANGE". +# # LOCAL CHANGE: # # 1. Edit the local pylintrc_tweaks file to add changes just to this @@ -32,19 +36,16 @@ # # 3. Run (in edx-lint): # -# # uses pylintrc_tweaks from edx-lint for linting in edx-lint -# # NOTE: Use Python 3.x, which no longer includes comments in the output file # $ edx_lint write pylintrc # # 4. Make a new version of edx_lint, submit and review a pull request with the -# pylintrc update, and after merging, update the edx-lint version by -# creating a new tag in the repo (uses pbr). +# pylintrc update, and after merging, update the edx-lint version and +# publish the new version. # # 5. In your local repo, install the newer version of edx-lint. # # 6. Run: # -# # uses local pylintrc_tweaks # $ edx_lint write pylintrc # # 7. This will modify the local file. Submit a pull request to get it @@ -63,6 +64,8 @@ # SERIOUSLY. # # ------------------------------ +# Generated by edx-lint version: 5.2.1 +# ------------------------------ [MASTER] ignore = migrations persistent = yes @@ -73,136 +76,150 @@ enable = blacklisted-name, line-too-long, - syntax-error, - init-is-generator, - return-in-init, - function-redefined, - not-in-loop, - return-outside-function, - yield-outside-function, - return-arg-in-generator, - nonexistent-operator, - duplicate-argument-name, abstract-class-instantiated, - bad-reversed-sequence, - continue-in-finally, - method-hidden, + abstract-method, access-member-before-definition, - no-method-argument, - no-self-argument, - invalid-slots-object, + anomalous-backslash-in-string, + anomalous-unicode-escape-in-string, + arguments-differ, + assert-on-tuple, assigning-non-slot, - invalid-slots, - inherit-non-class, - inconsistent-mro, + assignment-from-no-return, + assignment-from-none, + attribute-defined-outside-init, + bad-except-order, + bad-format-character, + bad-format-string-key, + bad-format-string, + bad-open-mode, + bad-reversed-sequence, + bad-staticmethod-argument, + bad-str-strip-call, + bad-super-call, + binary-op-exception, + boolean-datetime, + catching-non-exception, + cell-var-from-loop, + confusing-with-statement, + continue-in-finally, + cyclical-import, + dangerous-default-value, + dict-items-not-iterating, + dict-keys-not-iterating, + dict-values-not-iterating, + duplicate-argument-name, duplicate-bases, - non-iterator-returned, - unexpected-special-method-signature, - invalid-length-returned, + duplicate-except, + duplicate-key, + eq-without-hash, + exception-escape, + exception-message-attribute, + expression-not-assigned, + filter-builtin-not-iterating, + format-combined-specification, + format-needs-mapping, + function-redefined, + global-variable-undefined, import-error, - used-before-assignment, - undefined-variable, - undefined-all-variable, + import-self, + inconsistent-mro, + indexing-exception, + inherit-non-class, + init-is-generator, invalid-all-object, - no-name-in-module, - unbalance-tuple-unpacking, - unpacking-non-sequence, - bad-except-order, - raising-bad-type, - misplaced-bare-raise, - raising-non-exception, - nonimplemented-raised, - catching-non-exception, - slots-on-old-class, - super-on-old-class, - bad-super-call, - missing-super-argument, - no-member, - not-callable, - assignment-from-no-return, - no-value-for-parameter, - too-many-function-args, - unexpected-keyword-arg, - redundant-keyword-arg, + invalid-encoded-data, + invalid-format-index, + invalid-length-returned, invalid-sequence-index, invalid-slice-index, - assignment-from-none, - not-context-manager, + invalid-slots-object, + invalid-slots, + invalid-str-codec, invalid-unary-operand-type, - unsupported-binary-operation, - repeated-keyword, - not-an-iterable, - not-a-mapping, - unsupported-membership-test, - unsubscriptable-object, - logging-unsupported-format, - logging-too-many-args, logging-too-few-args, - bad-format-character, - truncated-format-string, - mixed-fomat-string, - format-needs-mapping, + logging-too-many-args, + logging-unsupported-format, + lost-exception, + map-builtin-not-iterating, + method-hidden, + misplaced-bare-raise, + misplaced-future, + missing-format-argument-key, + missing-format-attribute, missing-format-string-key, - too-many-format-args, - too-few-format-args, - bad-str-strip-call, + missing-super-argument, + mixed-fomat-string, model-unicode-not-callable, - super-method-not-called, + no-member, + no-method-argument, + no-name-in-module, + no-self-argument, + no-value-for-parameter, + non-iterator-returned, non-parent-method-called, - test-inherits-tests, - translation-of-non-string, - redefined-variable-type, - cyclical-import, - unreachable, - dangerous-default-value, + nonexistent-operator, + nonimplemented-raised, + nonstandard-exception, + not-a-mapping, + not-an-iterable, + not-callable, + not-context-manager, + not-in-loop, pointless-statement, pointless-string-statement, - expression-not-assigned, - duplicate-key, - confusing-with-statement, - using-constant-test, - lost-exception, - assert-on-tuple, - attribute-defined-outside-init, - bad-staticmethod-argument, - arguments-differ, - signature-differs, - abstract-method, - super-init-not-called, - relative-import, - import-self, - misplaced-future, - invalid-encoded-data, - global-variable-undefined, - redefined-outer-name, + property-on-old-class, + raising-bad-type, + raising-non-exception, + raising-string, + range-builtin-not-iterating, redefined-builtin, redefined-in-handler, + redefined-outer-name, + redefined-variable-type, + redundant-keyword-arg, + relative-import, + repeated-keyword, + return-arg-in-generator, + return-in-init, + return-outside-function, + signature-differs, + slots-on-old-class, + super-init-not-called, + super-method-not-called, + super-on-old-class, + syntax-error, + sys-max-int, + test-inherits-tests, + too-few-format-args, + too-many-format-args, + too-many-function-args, + translation-of-non-string, + truncated-format-string, + unbalance-tuple-unpacking, + undefined-all-variable, undefined-loop-variable, - cell-var-from-loop, - duplicate-except, - nonstandard-exception, - binary-op-exception, - property-on-old-class, - bad-format-string-key, - unused-format-string-key, - bad-format-string, - missing-format-argument-key, + undefined-variable, + unexpected-keyword-arg, + unexpected-special-method-signature, + unpacking-non-sequence, + unreachable, + unsubscriptable-object, + unsupported-binary-operation, + unsupported-membership-test, unused-format-string-argument, - format-combined-specification, - missing-format-attribute, - invalid-format-index, - anomalous-backslash-in-string, - anomalous-unicode-escape-in-string, - bad-open-mode, - boolean-datetime, + unused-format-string-key, + used-before-assignment, + using-constant-test, + yield-outside-function, + zip-builtin-not-iterating, - fatal, astroid-error, - parse-error, - method-check-failed, + django-not-available-placeholder, django-not-available, + fatal, + method-check-failed, + parse-error, raw-checker-failed, - django-not-available-placeholder, empty-docstring, invalid-characters-in-docstring, @@ -210,156 +227,170 @@ enable = wrong-spelling-in-comment, wrong-spelling-in-docstring, + unused-argument, unused-import, unused-variable, - unused-argument, - exec-used, eval-used, + exec-used, bad-classmethod-argument, bad-mcs-classmethod-argument, bad-mcs-method-argument, bad-whitespace, + bare-except, + broad-except, consider-iterating-dictionary, consider-using-enumerate, + global-at-module-level, + global-variable-not-assigned, literal-used-as-attribute, + logging-format-interpolation, + logging-not-lazy, + metaclass-assignment, + model-has-unicode, + model-missing-unicode, + model-no-explicit-unicode, multiple-imports, multiple-statements, + no-classmethod-decorator, + no-staticmethod-decorator, + old-raise-syntax, old-style-class, + protected-access, + redundant-unittest-assert, + reimported, + simplifiable-if-statement, simplifiable-range, singleton-comparison, superfluous-parens, unidiomatic-typecheck, - unneeded-not, - wrong-assert-type, - simplifiable-if-statement, - no-classmethod-decorator, - no-staticmethod-decorator, - unnecessary-pass, unnecessary-lambda, - useless-else-on-loop, + unnecessary-pass, unnecessary-semicolon, - reimported, - global-variable-not-assigned, - global-at-module-level, - bare-except, - broad-except, - logging-not-lazy, - redundant-unittest-assert, - model-missing-unicode, - model-has-unicode, - model-no-explicit-unicode, - protected-access, + unneeded-not, + useless-else-on-loop, + wrong-assert-type, - deprecated-module, deprecated-method, + deprecated-module, + too-many-boolean-expressions, too-many-nested-blocks, too-many-statements, - too-many-boolean-expressions, + wildcard-import, wrong-import-order, wrong-import-position, - wildcard-import, missing-final-newline, + mixed-indentation, mixed-line-endings, trailing-newlines, trailing-whitespace, unexpected-line-ending-format, - mixed-indentation, + bad-inline-option, bad-option-value, + deprecated-pragma, unrecognized-inline-option, useless-suppression, - bad-inline-option, - deprecated-pragma, + + cmp-method, + coerce-method, + delslice-method, + dict-iter-method, + dict-view-method, + div-method, + getslice-method, + hex-method, + idiv-method, + next-method-called, + next-method-defined, + nonzero-method, + oct-method, + rdiv-method, + setslice-method, + using-cmp-argument, disable = bad-continuation, - invalid-name, - misplaced-comparison-constant, - file-ignored, bad-indentation, - lowercase-l-suffix, - unused-wildcard-import, + consider-using-f-string, + duplicate-code, + file-ignored, + fixme, global-statement, + invalid-name, + locally-disabled, + locally-enabled, + lowercase-l-suffix, + misplaced-comparison-constant, no-else-return, + no-init, + no-self-use, + suppressed-message, + too-few-public-methods, + too-many-ancestors, + too-many-arguments, + too-many-branches, + too-many-instance-attributes, + too-many-lines, + too-many-locals, + too-many-public-methods, + too-many-return-statements, + ungrouped-imports, + unspecified-encoding, + unused-wildcard-import, + use-maxsplit-arg, + + feature-toggle-needs-doc, + illegal-waffle-usage, apply-builtin, backtick, + bad-python3-import, basestring-builtin, buffer-builtin, cmp-builtin, - cmp-method, coerce-builtin, - coerce-method, - delslice-method, - dict-iter-method, - dict-view-method, - duplicate-code, + deprecated-itertools-function, + deprecated-operator-function, + deprecated-str-translate-call, + deprecated-string-function, + deprecated-sys-function, + deprecated-types-field, + deprecated-urllib-function, execfile-builtin, - feature-toggle-needs-doc, file-builtin, - filter-builtin-not-iterating, - fixme, - getslice-method, - hex-method, - illegal-waffle-usage, import-star-module-level, - indexing-exception, input-builtin, intern-builtin, - locally-disabled, - locally-enabled, - logging-format-interpolation, long-builtin, long-suffix, - map-builtin-not-iterating, - metaclass-assignment, - next-method-called, no-absolute-import, - no-init, - no-self-use, - nonzero-method, - oct-method, + non-ascii-bytes-literal, old-division, old-ne-operator, old-octal-literal, - old-raise-syntax, parameter-unpacking, print-statement, - raising-string, - range-builtin-not-iterating, raw_input-builtin, reduce-builtin, reload-builtin, round-builtin, - setslice-method, standarderror-builtin, - suppressed-message, - too-few-public-methods, - too-many-ancestors, - too-many-arguments, - too-many-branches, - too-many-instance-attributes, - too-many-lines, - too-many-locals, - too-many-public-methods, - too-many-return-statements, - ungrouped-imports, unichr-builtin, unicode-builtin, unpacking-in-except, - using-cmp-argument, xrange-builtin, - zip-builtin-not-iterating, + + logging-fstring-interpolation, [REPORTS] output-format = text files-output = no reports = no -evaluation = 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) +score = no [BASIC] bad-functions = map,filter,apply,input @@ -453,4 +484,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# fa592427dbddb8eab6dc9bd08565c9b530c67201 +# 4aab3dcb4fa137c503562dcd26a3be774bc1055e diff --git a/requirements/base.txt b/requirements/base.txt index 62e4ca2..64b844a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,21 +10,21 @@ asn1crypto==1.4.0 # via # oscrypto # snowflake-connector-python -attrs==21.2.0 +attrs==21.4.0 # via jsonschema azure-common==1.1.27 # via snowflake-connector-python -azure-core==1.21.0 +azure-core==1.21.1 # via azure-storage-blob azure-storage-blob==12.9.0 # via snowflake-connector-python babel==2.9.1 # via agate -boto3==1.20.20 +boto3==1.20.32 # via # dbt-redshift # snowflake-connector-python -botocore==1.23.20 +botocore==1.23.32 # via # boto3 # s3transfer @@ -42,7 +42,7 @@ cffi==1.15.0 # snowflake-connector-python chardet==4.0.0 # via snowflake-connector-python -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 # via requests colorama==0.4.4 # via dbt-core @@ -51,7 +51,6 @@ cryptography==3.4.8 # azure-storage-blob # dbt-snowflake # pyopenssl - # secretstorage # snowflake-connector-python dbt==0.21.1 # via -r requirements/base.in @@ -93,11 +92,11 @@ google-crc32c==1.3.0 # via google-resumable-media google-resumable-media==2.1.0 # via google-cloud-bigquery -googleapis-common-protos==1.53.0 +googleapis-common-protos==1.54.0 # via # dbt-bigquery # google-api-core -grpcio==1.42.0 +grpcio==1.43.0 # via # google-api-core # google-cloud-bigquery @@ -108,17 +107,13 @@ idna==3.3 # dbt-core # requests # snowflake-connector-python -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via jsonschema -isodate==0.6.0 +isodate==0.6.1 # via # agate # dbt-core # msrest -jeepney==0.7.1 - # via - # keyring - # secretstorage jinja2==2.11.3 # via dbt-core jmespath==0.10.0 @@ -161,14 +156,14 @@ parsedatetime==2.6 # via agate proto-plus==1.19.8 # via google-cloud-bigquery -protobuf==3.19.1 +protobuf==3.19.2 # via # dbt-bigquery # google-api-core # google-cloud-bigquery # googleapis-common-protos # proto-plus -psycopg2-binary==2.9.2 +psycopg2-binary==2.9.3 # via dbt-postgres pyasn1==0.4.8 # via @@ -206,7 +201,7 @@ pyyaml==6.0 # via # dbt-core # mashumaro -requests==2.26.0 +requests==2.27.1 # via # azure-core # dbt-core @@ -223,8 +218,6 @@ rsa==4.8 # via google-auth s3transfer==0.5.0 # via boto3 -secretstorage==3.3.1 - # via keyring six==1.16.0 # via # agate @@ -250,13 +243,13 @@ typing-extensions==3.10.0.2 # via # dbt-core # mashumaro -urllib3==1.26.7 +urllib3==1.26.8 # via # botocore # requests werkzeug==2.0.2 # via dbt-core -zipp==3.6.0 +zipp==3.7.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/travis.in b/requirements/ci.in similarity index 75% rename from requirements/travis.in rename to requirements/ci.in index 895a9c8..e203961 100644 --- a/requirements/travis.in +++ b/requirements/ci.in @@ -1,4 +1,4 @@ -# Requirements for running tests in Travis +# Requirements for running tests in CI -c constraints.txt codecov # Code coverage reporting diff --git a/requirements/travis.txt b/requirements/ci.txt similarity index 69% rename from requirements/travis.txt rename to requirements/ci.txt index 83d789c..ca4ef54 100644 --- a/requirements/travis.txt +++ b/requirements/ci.txt @@ -4,19 +4,17 @@ # # make upgrade # -backports.entry-points-selectable==1.1.1 - # via virtualenv certifi==2021.10.8 # via requests -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 # via requests codecov==2.1.12 - # via -r requirements/travis.in + # via -r requirements/ci.in coverage==6.2 # via codecov -distlib==0.3.3 +distlib==0.3.4 # via virtualenv -filelock==3.4.0 +filelock==3.4.2 # via # tox # virtualenv @@ -26,7 +24,7 @@ packaging==20.9 # via # -c requirements/constraints.txt # tox -platformdirs==2.4.0 +platformdirs==2.4.1 # via virtualenv pluggy==1.0.0 # via tox @@ -34,7 +32,7 @@ py==1.11.0 # via tox pyparsing==3.0.6 # via packaging -requests==2.26.0 +requests==2.27.1 # via codecov six==1.16.0 # via @@ -42,9 +40,9 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox==3.24.4 - # via -r requirements/travis.in -urllib3==1.26.7 +tox==3.24.5 + # via -r requirements/ci.in +urllib3==1.26.8 # via requests -virtualenv==20.10.0 +virtualenv==20.13.0 # via tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ece367a..8244718 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -9,4 +9,4 @@ # linking to it here is good. # quality (dbt-core, google-api-core, google-cloud-bigquery, pytest) require 20.9 vs travis (tox) require 21.3 -packaging==20.9 \ No newline at end of file +packaging==20.9 diff --git a/requirements/dev.in b/requirements/dev.in index dced7b9..2a4f82b 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -3,7 +3,7 @@ -r pip-tools.txt # pip-tools and its dependencies, for managing requirements files -r quality.txt # Core and quality check dependencies --r travis.txt # tox and related dependencies +-r ci.txt # tox and related dependencies diff-cover # Changeset diff test coverage tox-battery # Makes tox aware of requirements file changes diff --git a/requirements/dev.txt b/requirements/dev.txt index 8c4476f..d144286 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -13,12 +13,12 @@ asn1crypto==1.4.0 # -r requirements/quality.txt # oscrypto # snowflake-connector-python -astroid==2.9.0 +astroid==2.9.3 # via # -r requirements/quality.txt # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/quality.txt # jsonschema @@ -27,7 +27,7 @@ azure-common==1.1.27 # via # -r requirements/quality.txt # snowflake-connector-python -azure-core==1.21.0 +azure-core==1.21.1 # via # -r requirements/quality.txt # azure-storage-blob @@ -39,16 +39,12 @@ babel==2.9.1 # via # -r requirements/quality.txt # agate -backports.entry-points-selectable==1.1.1 - # via - # -r requirements/travis.txt - # virtualenv -boto3==1.20.20 +boto3==1.20.32 # via # -r requirements/quality.txt # dbt-redshift # snowflake-connector-python -botocore==1.23.20 +botocore==1.23.32 # via # -r requirements/quality.txt # boto3 @@ -59,8 +55,8 @@ cachetools==4.2.4 # google-auth certifi==2021.10.8 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # msrest # requests # snowflake-connector-python @@ -75,10 +71,10 @@ chardet==4.0.0 # -r requirements/quality.txt # diff-cover # snowflake-connector-python -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # requests click==8.0.3 # via @@ -97,15 +93,15 @@ code-annotations==1.2.0 # -r requirements/quality.txt # edx-lint codecov==2.1.12 - # via -r requirements/travis.txt + # via -r requirements/ci.txt colorama==0.4.4 # via # -r requirements/quality.txt # dbt-core coverage[toml]==6.2 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # codecov # pytest-cov cryptography==3.4.8 @@ -114,7 +110,6 @@ cryptography==3.4.8 # azure-storage-blob # dbt-snowflake # pyopenssl - # secretstorage # snowflake-connector-python dbt==0.21.1 # via -r requirements/quality.txt @@ -149,15 +144,15 @@ dbt-snowflake==0.21.1 # dbt diff-cover==6.4.4 # via -r requirements/dev.in -distlib==0.3.3 +distlib==0.3.4 # via - # -r requirements/travis.txt + # -r requirements/ci.txt # virtualenv edx-lint==5.2.1 # via -r requirements/quality.txt -filelock==3.4.0 +filelock==3.4.2 # via - # -r requirements/travis.txt + # -r requirements/ci.txt # tox # virtualenv google-api-core[grpc]==1.31.2 @@ -188,12 +183,12 @@ google-resumable-media==2.1.0 # via # -r requirements/quality.txt # google-cloud-bigquery -googleapis-common-protos==1.53.0 +googleapis-common-protos==1.54.0 # via # -r requirements/quality.txt # dbt-bigquery # google-api-core -grpcio==1.42.0 +grpcio==1.43.0 # via # -r requirements/quality.txt # google-api-core @@ -204,12 +199,12 @@ hologram==0.0.14 # dbt-core idna==3.3 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # dbt-core # requests # snowflake-connector-python -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via # -r requirements/quality.txt # jsonschema @@ -217,7 +212,7 @@ iniconfig==1.1.1 # via # -r requirements/quality.txt # pytest -isodate==0.6.0 +isodate==0.6.1 # via # -r requirements/quality.txt # agate @@ -227,11 +222,6 @@ isort==5.10.1 # via # -r requirements/quality.txt # pylint -jeepney==0.7.1 - # via - # -r requirements/quality.txt - # keyring - # secretstorage jinja2==2.11.3 # via # -r requirements/quality.txt @@ -255,7 +245,7 @@ keyring==21.8.0 # via # -r requirements/quality.txt # snowflake-connector-python -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via # -r requirements/quality.txt # astroid @@ -306,8 +296,8 @@ oscrypto==1.2.1 packaging==20.9 # via # -c requirements/constraints.txt + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # dbt-core # google-api-core # google-cloud-bigquery @@ -327,16 +317,16 @@ pep517==0.12.0 # pip-tools pip-tools==6.4.0 # via -r requirements/pip-tools.txt -platformdirs==2.4.0 +platformdirs==2.4.1 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # pylint # virtualenv pluggy==1.0.0 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # diff-cover # pytest # tox @@ -344,7 +334,7 @@ proto-plus==1.19.8 # via # -r requirements/quality.txt # google-cloud-bigquery -protobuf==3.19.1 +protobuf==3.19.2 # via # -r requirements/quality.txt # dbt-bigquery @@ -352,14 +342,14 @@ protobuf==3.19.1 # google-cloud-bigquery # googleapis-common-protos # proto-plus -psycopg2-binary==2.9.2 +psycopg2-binary==2.9.3 # via # -r requirements/quality.txt # dbt-postgres py==1.11.0 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # pytest # tox pyasn1==0.4.8 @@ -383,7 +373,7 @@ pycryptodomex==3.12.0 # snowflake-connector-python pydocstyle==6.1.1 # via -r requirements/quality.txt -pygments==2.10.0 +pygments==2.11.2 # via diff-cover pyjwt==2.3.0 # via @@ -400,11 +390,11 @@ pylint-celery==0.3 # via # -r requirements/quality.txt # edx-lint -pylint-django==2.4.4 +pylint-django==2.5.0 # via # -r requirements/quality.txt # edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # -r requirements/quality.txt # pylint-celery @@ -415,8 +405,8 @@ pyopenssl==20.0.1 # snowflake-connector-python pyparsing==3.0.6 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # packaging pyrsistent==0.18.0 # via @@ -455,10 +445,10 @@ pyyaml==6.0 # code-annotations # dbt-core # mashumaro -requests==2.26.0 +requests==2.27.1 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # azure-core # codecov # dbt-core @@ -481,14 +471,10 @@ s3transfer==0.5.0 # via # -r requirements/quality.txt # boto3 -secretstorage==3.3.1 - # via - # -r requirements/quality.txt - # keyring six==1.16.0 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # agate # azure-core # dbt-bigquery @@ -527,20 +513,20 @@ text-unidecode==1.3 # python-slugify toml==0.10.2 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # pylint # pytest # tox -tomli==1.2.2 +tomli==2.0.0 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt # coverage # pep517 -tox==3.24.4 +tox==3.24.5 # via - # -r requirements/travis.txt + # -r requirements/ci.txt # tox-battery tox-battery==0.6.1 # via -r requirements/dev.in @@ -551,21 +537,21 @@ typing-extensions==3.10.0.2 # dbt-core # mashumaro # pylint -urllib3==1.26.7 +urllib3==1.26.8 # via + # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/travis.txt # botocore # requests -virtualenv==20.10.0 +virtualenv==20.13.0 # via - # -r requirements/travis.txt + # -r requirements/ci.txt # tox werkzeug==2.0.2 # via # -r requirements/quality.txt # dbt-core -wheel==0.37.0 +wheel==0.37.1 # via # -r requirements/pip-tools.txt # pip-tools @@ -573,7 +559,7 @@ wrapt==1.13.3 # via # -r requirements/quality.txt # astroid -zipp==3.6.0 +zipp==3.7.0 # via # -r requirements/quality.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index 33cb797..da9246c 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -15,7 +15,7 @@ asn1crypto==1.4.0 # -r requirements/test.txt # oscrypto # snowflake-connector-python -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/test.txt # jsonschema @@ -24,7 +24,7 @@ azure-common==1.1.27 # via # -r requirements/test.txt # snowflake-connector-python -azure-core==1.21.0 +azure-core==1.21.1 # via # -r requirements/test.txt # azure-storage-blob @@ -39,12 +39,12 @@ babel==2.9.1 # sphinx bleach==4.1.0 # via readme-renderer -boto3==1.20.20 +boto3==1.20.32 # via # -r requirements/test.txt # dbt-redshift # snowflake-connector-python -botocore==1.23.20 +botocore==1.23.32 # via # -r requirements/test.txt # boto3 @@ -69,7 +69,7 @@ chardet==4.0.0 # via # -r requirements/test.txt # snowflake-connector-python -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 # via # -r requirements/test.txt # requests @@ -87,7 +87,6 @@ cryptography==3.4.8 # azure-storage-blob # dbt-snowflake # pyopenssl - # secretstorage # snowflake-connector-python dbt==0.21.1 # via -r requirements/test.txt @@ -158,12 +157,12 @@ google-resumable-media==2.1.0 # via # -r requirements/test.txt # google-cloud-bigquery -googleapis-common-protos==1.53.0 +googleapis-common-protos==1.54.0 # via # -r requirements/test.txt # dbt-bigquery # google-api-core -grpcio==1.42.0 +grpcio==1.43.0 # via # -r requirements/test.txt # google-api-core @@ -180,7 +179,7 @@ idna==3.3 # snowflake-connector-python imagesize==1.3.0 # via sphinx -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via # -r requirements/test.txt # jsonschema @@ -188,17 +187,12 @@ iniconfig==1.1.1 # via # -r requirements/test.txt # pytest -isodate==0.6.0 +isodate==0.6.1 # via # -r requirements/test.txt # agate # dbt-core # msrest -jeepney==0.7.1 - # via - # -r requirements/test.txt - # keyring - # secretstorage jinja2==2.11.3 # via # -r requirements/test.txt @@ -285,7 +279,7 @@ proto-plus==1.19.8 # via # -r requirements/test.txt # google-cloud-bigquery -protobuf==3.19.1 +protobuf==3.19.2 # via # -r requirements/test.txt # dbt-bigquery @@ -293,7 +287,7 @@ protobuf==3.19.1 # google-cloud-bigquery # googleapis-common-protos # proto-plus -psycopg2-binary==2.9.2 +psycopg2-binary==2.9.3 # via # -r requirements/test.txt # dbt-postgres @@ -318,7 +312,7 @@ pycryptodomex==3.12.0 # via # -r requirements/test.txt # snowflake-connector-python -pygments==2.10.0 +pygments==2.11.2 # via # doc8 # readme-renderer @@ -370,9 +364,9 @@ pyyaml==6.0 # -r requirements/test.txt # dbt-core # mashumaro -readme-renderer==30.0 +readme-renderer==32.0 # via -r requirements/doc.in -requests==2.26.0 +requests==2.27.1 # via # -r requirements/test.txt # azure-core @@ -399,10 +393,6 @@ s3transfer==0.5.0 # via # -r requirements/test.txt # boto3 -secretstorage==3.3.1 - # via - # -r requirements/test.txt - # keyring six==1.16.0 # via # -r requirements/test.txt @@ -427,7 +417,7 @@ snowflake-connector-python[secure-local-storage]==2.5.1 # via # -r requirements/test.txt # dbt-snowflake -sphinx==4.3.1 +sphinx==4.3.2 # via # -r requirements/doc.in # edx-sphinx-theme @@ -457,7 +447,7 @@ toml==0.10.2 # via # -r requirements/test.txt # pytest -tomli==1.2.2 +tomli==2.0.0 # via # -r requirements/test.txt # coverage @@ -466,7 +456,7 @@ typing-extensions==3.10.0.2 # -r requirements/test.txt # dbt-core # mashumaro -urllib3==1.26.7 +urllib3==1.26.8 # via # -r requirements/test.txt # botocore @@ -477,7 +467,7 @@ werkzeug==2.0.2 # via # -r requirements/test.txt # dbt-core -zipp==3.6.0 +zipp==3.7.0 # via # -r requirements/test.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 51eb3dc..f4b4921 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,9 +10,9 @@ pep517==0.12.0 # via pip-tools pip-tools==6.4.0 # via -r requirements/pip-tools.in -tomli==1.2.2 +tomli==2.0.0 # via pep517 -wheel==0.37.0 +wheel==0.37.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.in b/requirements/pip.in new file mode 100644 index 0000000..21ce8e9 --- /dev/null +++ b/requirements/pip.in @@ -0,0 +1,5 @@ +# Core dependencies for installing other packages + +pip +setuptools +wheel diff --git a/requirements/pip.txt b/requirements/pip.txt new file mode 100644 index 0000000..de37a34 --- /dev/null +++ b/requirements/pip.txt @@ -0,0 +1,14 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# make upgrade +# +wheel==0.37.1 + # via -r requirements/pip.in + +# The following packages are considered to be unsafe in a requirements file: +pip==21.3.1 + # via -r requirements/pip.in +setuptools==60.5.0 + # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index e1d09a6..3261ff9 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -13,11 +13,11 @@ asn1crypto==1.4.0 # -r requirements/test.txt # oscrypto # snowflake-connector-python -astroid==2.9.0 +astroid==2.9.3 # via # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/test.txt # jsonschema @@ -26,7 +26,7 @@ azure-common==1.1.27 # via # -r requirements/test.txt # snowflake-connector-python -azure-core==1.21.0 +azure-core==1.21.1 # via # -r requirements/test.txt # azure-storage-blob @@ -38,12 +38,12 @@ babel==2.9.1 # via # -r requirements/test.txt # agate -boto3==1.20.20 +boto3==1.20.32 # via # -r requirements/test.txt # dbt-redshift # snowflake-connector-python -botocore==1.23.20 +botocore==1.23.32 # via # -r requirements/test.txt # boto3 @@ -68,7 +68,7 @@ chardet==4.0.0 # via # -r requirements/test.txt # snowflake-connector-python -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 # via # -r requirements/test.txt # requests @@ -95,7 +95,6 @@ cryptography==3.4.8 # azure-storage-blob # dbt-snowflake # pyopenssl - # secretstorage # snowflake-connector-python dbt==0.21.1 # via -r requirements/test.txt @@ -158,12 +157,12 @@ google-resumable-media==2.1.0 # via # -r requirements/test.txt # google-cloud-bigquery -googleapis-common-protos==1.53.0 +googleapis-common-protos==1.54.0 # via # -r requirements/test.txt # dbt-bigquery # google-api-core -grpcio==1.42.0 +grpcio==1.43.0 # via # -r requirements/test.txt # google-api-core @@ -178,7 +177,7 @@ idna==3.3 # dbt-core # requests # snowflake-connector-python -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via # -r requirements/test.txt # jsonschema @@ -186,7 +185,7 @@ iniconfig==1.1.1 # via # -r requirements/test.txt # pytest -isodate==0.6.0 +isodate==0.6.1 # via # -r requirements/test.txt # agate @@ -196,11 +195,6 @@ isort==5.10.1 # via # -r requirements/quality.in # pylint -jeepney==0.7.1 - # via - # -r requirements/test.txt - # keyring - # secretstorage jinja2==2.11.3 # via # -r requirements/test.txt @@ -223,7 +217,7 @@ keyring==21.8.0 # via # -r requirements/test.txt # snowflake-connector-python -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via astroid leather==0.3.4 # via @@ -281,7 +275,7 @@ parsedatetime==2.6 # agate pbr==5.8.0 # via stevedore -platformdirs==2.4.0 +platformdirs==2.4.1 # via pylint pluggy==1.0.0 # via @@ -291,7 +285,7 @@ proto-plus==1.19.8 # via # -r requirements/test.txt # google-cloud-bigquery -protobuf==3.19.1 +protobuf==3.19.2 # via # -r requirements/test.txt # dbt-bigquery @@ -299,7 +293,7 @@ protobuf==3.19.1 # google-cloud-bigquery # googleapis-common-protos # proto-plus -psycopg2-binary==2.9.2 +psycopg2-binary==2.9.3 # via # -r requirements/test.txt # dbt-postgres @@ -340,9 +334,9 @@ pylint==2.12.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.4.4 +pylint-django==2.5.0 # via edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # pylint-celery # pylint-django @@ -391,7 +385,7 @@ pyyaml==6.0 # code-annotations # dbt-core # mashumaro -requests==2.26.0 +requests==2.27.1 # via # -r requirements/test.txt # azure-core @@ -415,10 +409,6 @@ s3transfer==0.5.0 # via # -r requirements/test.txt # boto3 -secretstorage==3.3.1 - # via - # -r requirements/test.txt - # keyring six==1.16.0 # via # -r requirements/test.txt @@ -457,7 +447,7 @@ toml==0.10.2 # -r requirements/test.txt # pylint # pytest -tomli==1.2.2 +tomli==2.0.0 # via # -r requirements/test.txt # coverage @@ -468,7 +458,7 @@ typing-extensions==3.10.0.2 # dbt-core # mashumaro # pylint -urllib3==1.26.7 +urllib3==1.26.8 # via # -r requirements/test.txt # botocore @@ -479,7 +469,7 @@ werkzeug==2.0.2 # dbt-core wrapt==1.13.3 # via astroid -zipp==3.6.0 +zipp==3.7.0 # via # -r requirements/test.txt # importlib-metadata diff --git a/requirements/test.txt b/requirements/test.txt index 5052e69..92c5c92 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -13,7 +13,7 @@ asn1crypto==1.4.0 # -r requirements/base.txt # oscrypto # snowflake-connector-python -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/base.txt # jsonschema @@ -22,7 +22,7 @@ azure-common==1.1.27 # via # -r requirements/base.txt # snowflake-connector-python -azure-core==1.21.0 +azure-core==1.21.1 # via # -r requirements/base.txt # azure-storage-blob @@ -34,12 +34,12 @@ babel==2.9.1 # via # -r requirements/base.txt # agate -boto3==1.20.20 +boto3==1.20.32 # via # -r requirements/base.txt # dbt-redshift # snowflake-connector-python -botocore==1.23.20 +botocore==1.23.32 # via # -r requirements/base.txt # boto3 @@ -64,7 +64,7 @@ chardet==4.0.0 # via # -r requirements/base.txt # snowflake-connector-python -charset-normalizer==2.0.9 +charset-normalizer==2.0.10 # via # -r requirements/base.txt # requests @@ -80,7 +80,6 @@ cryptography==3.4.8 # azure-storage-blob # dbt-snowflake # pyopenssl - # secretstorage # snowflake-connector-python dbt==0.21.1 # via -r requirements/base.txt @@ -141,12 +140,12 @@ google-resumable-media==2.1.0 # via # -r requirements/base.txt # google-cloud-bigquery -googleapis-common-protos==1.53.0 +googleapis-common-protos==1.54.0 # via # -r requirements/base.txt # dbt-bigquery # google-api-core -grpcio==1.42.0 +grpcio==1.43.0 # via # -r requirements/base.txt # google-api-core @@ -161,23 +160,18 @@ idna==3.3 # dbt-core # requests # snowflake-connector-python -importlib-metadata==4.8.2 +importlib-metadata==4.10.0 # via # -r requirements/base.txt # jsonschema iniconfig==1.1.1 # via pytest -isodate==0.6.0 +isodate==0.6.1 # via # -r requirements/base.txt # agate # dbt-core # msrest -jeepney==0.7.1 - # via - # -r requirements/base.txt - # keyring - # secretstorage jinja2==2.11.3 # via # -r requirements/base.txt @@ -257,7 +251,7 @@ proto-plus==1.19.8 # via # -r requirements/base.txt # google-cloud-bigquery -protobuf==3.19.1 +protobuf==3.19.2 # via # -r requirements/base.txt # dbt-bigquery @@ -265,7 +259,7 @@ protobuf==3.19.1 # google-cloud-bigquery # googleapis-common-protos # proto-plus -psycopg2-binary==2.9.2 +psycopg2-binary==2.9.3 # via # -r requirements/base.txt # dbt-postgres @@ -333,7 +327,7 @@ pyyaml==6.0 # -r requirements/base.txt # dbt-core # mashumaro -requests==2.26.0 +requests==2.27.1 # via # -r requirements/base.txt # azure-core @@ -357,10 +351,6 @@ s3transfer==0.5.0 # via # -r requirements/base.txt # boto3 -secretstorage==3.3.1 - # via - # -r requirements/base.txt - # keyring six==1.16.0 # via # -r requirements/base.txt @@ -391,14 +381,14 @@ text-unidecode==1.3 # python-slugify toml==0.10.2 # via pytest -tomli==1.2.2 +tomli==2.0.0 # via coverage typing-extensions==3.10.0.2 # via # -r requirements/base.txt # dbt-core # mashumaro -urllib3==1.26.7 +urllib3==1.26.8 # via # -r requirements/base.txt # botocore @@ -407,7 +397,7 @@ werkzeug==2.0.2 # via # -r requirements/base.txt # dbt-core -zipp==3.6.0 +zipp==3.7.0 # via # -r requirements/base.txt # importlib-metadata diff --git a/setup.py b/setup.py index 36401d0..8c717eb 100755 --- a/setup.py +++ b/setup.py @@ -115,7 +115,7 @@ def is_requirement(line): ], include_package_data=True, install_requires=load_requirements('requirements/base.in'), - python_requires=">=3.6", + python_requires=">=3.8", license="AGPL 3.0", zip_safe=False, keywords='Python edx dbt schema builder', @@ -130,7 +130,6 @@ def is_requirement(line): 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.8', ], ) From da16eb322e517e9369a4615c09b71fa4aa165485 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Wed, 12 Jan 2022 15:48:57 +0500 Subject: [PATCH 2/2] build: set the default main branch for push trigger --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a28375..93472df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: Python CI on: push: branches: - - master + - main pull_request: branches: - '**'