Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/pypa/gh-action-pyp…
Browse files Browse the repository at this point in the history
…i-publish-1.12.3
  • Loading branch information
edgarrmondragon authored Dec 9, 2024
2 parents ee7c5fe + 0ed4132 commit ee0d40e
Show file tree
Hide file tree
Showing 16 changed files with 1,127 additions and 1,266 deletions.
2 changes: 1 addition & 1 deletion .env.template
Original file line number Diff line number Diff line change
@@ -1 +1 @@
TAP_HUBSPOT_ACCESS_TOKEN = ''
TAP_HUBSPOT_ACCESS_TOKEN=''
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ updates:
commit-message:
prefix: "chore(deps): "
prefix-development: "chore(deps-dev): "
versioning-strategy: increase-if-necessary
- package-ecosystem: pip
directory: "/.github/workflows"
schedule:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
# Only lint using the primary version used for dev
python-version: [3.9]
python-version: [3.13]

steps:
- uses: actions/checkout@v4
Expand All @@ -33,7 +33,7 @@ jobs:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
strategy:
matrix:
python-version: [3.9]
python-version: [3.13]

steps:
- uses: actions/checkout@v4
Expand All @@ -51,8 +51,6 @@ jobs:
id: test_pytest
continue-on-error: false
env:
TAP_HUBSPOT_CLIENT_ID: ${{secrets.TAP_HUBSPOT_CLIENT_ID}}
TAP_HUBSPOT_CLIENT_SECRET: ${{secrets.TAP_HUBSPOT_CLIENT_SECRET}}
TAP_HUBSPOT_REFRESH_TOKEN: ${{secrets.TAP_HUBSPOT_REFRESH_TOKEN}}
TAP_HUBSPOT_ACCESS_TOKEN: ${{secrets.TAP_HUBSPOT_ACCESS_TOKEN}}
run: |
poetry run pytest --capture=no
4 changes: 2 additions & 2 deletions .github/workflows/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
nox==2023.4.22
nox==2024.10.9
nox-poetry==1.0.3
pip==24.0
pip==24.3.1
poetry==1.8.5
poetry-dynamic-versioning==1.4.1
12 changes: 4 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: check-json
- id: check-toml
Expand All @@ -14,18 +14,14 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.263
rev: v0.8.2
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]

- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black
- id: ruff-format

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.2.0
rev: v1.13.0
hooks:
- id: mypy
additional_dependencies:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ You can easily run `tap-hubspot` by itself or in a pipeline using [Meltano](http

The following Streams use the v1 (legacy) endpoint in the Hubspot API:

1. [TicketPipeline & DealPipeline](https://legacydocs.hubspot.com/docs/methods/pipelines/pipelines_overview): The v3 endpoint requires a pipeline ID parameter to make calls to the API. Because of this,
1. [TicketPipeline & DealPipeline](https://legacydocs.hubspot.com/docs/methods/pipelines/pipelines_overview): The v3 endpoint requires a pipeline ID parameter to make calls to the API. Because of this,
you are limited to only pulling data for a single pipeline ID from v3, whereas the v1 API allows you to pull from all pipelines.
2. [EmailSubscriptions](https://legacydocs.hubspot.com/docs/methods/email/email_subscriptions_overview): The v3 endpoint requires you to set a single email address to pull subscription data, whereas
2. [EmailSubscriptions](https://legacydocs.hubspot.com/docs/methods/email/email_subscriptions_overview): The v3 endpoint requires you to set a single email address to pull subscription data, whereas
the v1 endpoint allows you to pull data from all emails.


Expand Down
2 changes: 1 addition & 1 deletion meltano.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins:
- name: start_date
value: '2023-01-01T00:00:00Z'
- name: end_date
value: '2023-05-22T00:00:00Z'
value: '2023-05-22T00:00:00Z'
environments:
- name: dev
- name: staging
Expand Down
6 changes: 0 additions & 6 deletions mypy.ini

This file was deleted.

1,681 changes: 865 additions & 816 deletions poetry.lock

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,49 +14,49 @@ packages = [
]

[tool.poetry.dependencies]
python = "<3.12,>=3.7.1"
backports-datetime-fromisoformat = {version = "^2.0.1", python = "<3.11"}
cached-property = "^1" # Remove after Python 3.7 support is dropped
fs-s3fs = { version = "^1.1.1", optional = true }
requests = "^2.28.2"
singer-sdk = { version="^0.33.1" }
python = ">=3.9"
backports-datetime-fromisoformat = {version = "==2.0.2", python = "<3.11"}
fs-s3fs = { version = "~=1.1.1", optional = true }
requests = "==2.32.2"
singer-sdk = { version="~=0.42.0" }

[tool.poetry.group.dev.dependencies]
pytest = "^7.2.1"
singer-sdk = { version="^0.33.1", extras = ["testing"] }

[tool.isort]
profile = "black"
multi_line_output = 3 # Vertical Hanging Indent
src_paths = "tap_linkedin"
pytest = ">=7"
singer-sdk = { version="~=0.42.0", extras = ["testing"] }

[tool.poetry.extras]
s3 = ["fs-s3fs"]

[tool.mypy]
python_version = "3.9"
warn_redundant_casts = true
warn_unused_configs = true
warn_unused_ignores = true

[tool.ruff]
ignore = [
"ANN101", # missing-type-self
"ANN102", # missing-type-cls
[[tool.mypy.overrides]]
ignore_missing_imports = true
module = [
"backports.datetime_fromisoformat.*",
]
select = ["ALL"]

[tool.ruff]
src = ["tap_hubspot"]
target-version = "py37"
target-version = "py39"

[tool.ruff.lint]
select = ["ALL"]

[tool.ruff.flake8-annotations]
[tool.ruff.lint.flake8-annotations]
allow-star-arg-any = true

[tool.ruff.isort]
[tool.ruff.lint.isort]
known-first-party = ["tap_hubspot"]

[tool.ruff.pydocstyle]
[tool.ruff.lint.pydocstyle]
convention = "google"

[build-system]
requires = ["poetry-core==1.8.1", "poetry-dynamic-versioning==1.2.0"]
requires = ["poetry-core==1.9.1", "poetry-dynamic-versioning==1.4.1"]
build-backend = "poetry_dynamic_versioning.backend"

[tool.poetry.scripts]
Expand Down
2 changes: 1 addition & 1 deletion tap_hubspot/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class HubSpotOAuthAuthenticator(OAuthAuthenticator, metaclass=SingletonMeta):
"""Authenticator class for HubSpot."""

@property
def oauth_request_body(self):
def oauth_request_body(self): # noqa: ANN201, D102
return {
"grant_type": "refresh_token",
"client_id": self.config["client_id"],
Expand Down
Loading

0 comments on commit ee0d40e

Please sign in to comment.