Skip to content

Commit 5d33568

Browse files
committed
Merge branch 'release/0.14.0'
2 parents e962e83 + b04e35a commit 5d33568

13 files changed

Lines changed: 72 additions & 29 deletions

File tree

.github/workflows/cd.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Setup Python
19-
uses: actions/setup-python@v2
19+
uses: actions/setup-python@v4
2020

2121
- name: Get tag and tracker versions
2222
id: version
@@ -40,10 +40,10 @@ jobs:
4040

4141
steps:
4242
- name: Checkout code
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
4444

4545
- name: Setup Python
46-
uses: actions/setup-python@v2
46+
uses: actions/setup-python@v4
4747
with:
4848
python-version: ${{ matrix.python-version }}
4949

@@ -57,7 +57,7 @@ jobs:
5757
python setup.py sdist bdist_wheel
5858
5959
- name: Upload artifacts
60-
uses: actions/upload-artifact@v2
60+
uses: actions/upload-artifact@v3
6161
with:
6262
name: distfiles_${{ github.run_id }}
6363
path: dist
@@ -68,15 +68,15 @@ jobs:
6868

6969
steps:
7070
- name: Checkout code
71-
uses: actions/checkout@v2
71+
uses: actions/checkout@v3
7272

7373
- name: Setup Python
74-
uses: actions/setup-python@v2
74+
uses: actions/setup-python@v4
7575
with:
7676
python-version: '3.x'
7777

7878
- name: Download artifacts
79-
uses: actions/download-artifact@v2
79+
uses: actions/download-artifact@v3
8080
with:
8181
name: distfiles_${{ github.run_id }}
8282
path: ${{ github.workspace }}/dist
@@ -100,7 +100,7 @@ jobs:
100100

101101
steps:
102102
- name: Checkout code
103-
uses: actions/checkout@v2
103+
uses: actions/checkout@v3
104104

105105
- name: Release
106106
uses: softprops/action-gh-release@v1

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828

2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
3232

3333
- name: Setup Python ${{ matrix.python-version }}
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v4
3535
with:
3636
python-version: ${{ matrix.python-version }}
3737

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v1
11+
- uses: actions/checkout@v3
1212
- uses: ammaraskar/sphinx-action@master
1313
with:
1414
docs-folder: "docs/"

.github/workflows/snyk.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- uses: snyk/actions/setup@master
1414

1515
- name: Set up Python 3.8
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v4
1717
with:
1818
python-version: 3.8
1919
- name: Install dependencies

CHANGES.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Version 0.14.0 (2023-03-21)
2+
---------------------------
3+
Adds deprecation warnings for V1 changes (#315)
4+
Update GH actions to use Node16 (#317)
5+
Adds event store parameter to Snowplow interface (#320)
6+
Adds missing parameters to async emitter (#323)
7+
18
Version 0.13.0 (2023-01-24)
29
---------------------------
310
Adds Snowplow Interface (#295)

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
author = 'Alex Dean, Paul Boocock, Matus Tomlein, Jack Keene'
2929

3030
# The full version, including alpha/beta/rc tags
31-
release = "0.13"
31+
release = "0.14"
3232

3333

3434
# -- General configuration ---------------------------------------------------

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
setup(
3535
name="snowplow-tracker",
36-
version="0.13.0",
36+
version="0.14.0",
3737
author=authors_str,
3838
author_email=authors_email_str,
3939
packages=[

snowplow_tracker/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
# language governing permissions and limitations there under.
1616
# """
1717

18-
__version_info__ = (0, 13, 0)
18+
__version_info__ = (0, 14, 0)
1919
__version__ = ".".join(str(x) for x in __version_info__)
2020
__build_version__ = __version__ + ""

snowplow_tracker/celery/celery_emitter.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import logging
1919
from typing import Any, Optional
20+
from warnings import warn
2021

2122
from snowplow_tracker.emitters import Emitter
2223
from snowplow_tracker.typing import HttpProtocol, Method
@@ -41,7 +42,6 @@ class CeleryEmitter(Emitter):
4142
"""
4243

4344
if _CELERY_OPT:
44-
4545
celery_app = None
4646

4747
def __init__(
@@ -53,6 +53,11 @@ def __init__(
5353
batch_size: Optional[int] = None,
5454
byte_limit: Optional[int] = None,
5555
) -> None:
56+
warn(
57+
"The Celery Emitter will be deprecated in future versions.",
58+
DeprecationWarning,
59+
stacklevel=2,
60+
)
5661
super(CeleryEmitter, self).__init__(
5762
endpoint, protocol, port, method, batch_size, None, None, byte_limit
5863
)

snowplow_tracker/emitters.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,10 @@ def __init__(
439439
on_failure: Optional[FailureCallback] = None,
440440
thread_count: int = 1,
441441
byte_limit: Optional[int] = None,
442+
request_timeout: Optional[Union[float, Tuple[float, float]]] = None,
442443
max_retry_delay_seconds: int = 60,
443444
buffer_capacity: int = None,
445+
custom_retry_codes: Dict[int, bool] = {},
444446
event_store: Optional[EventStore] = None,
445447
) -> None:
446448
"""
@@ -476,17 +478,19 @@ def __init__(
476478
:type event_store: EventStore
477479
"""
478480
super(AsyncEmitter, self).__init__(
479-
endpoint,
480-
protocol,
481-
port,
482-
method,
483-
batch_size,
484-
on_success,
485-
on_failure,
486-
byte_limit,
487-
max_retry_delay_seconds,
488-
buffer_capacity,
489-
event_store,
481+
endpoint=endpoint,
482+
protocol=protocol,
483+
port=port,
484+
method=method,
485+
batch_size=batch_size,
486+
on_success=on_success,
487+
on_failure=on_failure,
488+
byte_limit=byte_limit,
489+
request_timeout=request_timeout,
490+
max_retry_delay_seconds=max_retry_delay_seconds,
491+
buffer_capacity=buffer_capacity,
492+
custom_retry_codes=custom_retry_codes,
493+
event_store=event_store,
490494
)
491495
self.queue = Queue()
492496
for i in range(thread_count):

0 commit comments

Comments
 (0)