Skip to content

Commit

Permalink
Merge pull request #372 from snowplow/release/1.0.4
Browse files Browse the repository at this point in the history
Release/1.0.4
  • Loading branch information
matus-tomlein authored Nov 20, 2024
2 parents 2c381e0 + 9a70fb3 commit 7fd3d0a
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
name: Snowplow Python Tracker v${{ needs.version_check.outputs.v_tracker }}
name: Version ${{ needs.version_check.outputs.v_tracker }}
draft: false
prerelease: ${{ contains(needs.version_check.outputs.v_tracker, 'rc') }}
15 changes: 12 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,24 @@ jobs:
runs-on: ubuntu-20.04

strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
python-version:
- 3.6
- 3.7
- 3.8
- 3.9
- "3.10"
- "3.11"
- "3.12"
- "3.13"

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 1.0.4 (2024-11-19)
--------------------------
Test with Python 3.13 (#365) (Thanks to @edgarrmondragon)
Shorten automatic github release title (#352)

Version 1.0.3 (2024-08-27)
--------------------------
Fix docs action (close #367)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
RUN git clone --depth=1 https://github.com/pyenv/pyenv.git $PYENV_ROOT
RUN git clone --depth=1 https://github.com/pyenv/pyenv-virtualenv.git $PYENV_ROOT/plugins/pyenv-virtualenv

RUN pyenv install 3.5.10 && pyenv install 3.6.14 && pyenv install 3.7.11 && pyenv install 3.8.11 && pyenv install 3.9.6 && pyenv install 3.10.1 && pyenv install 3.11.0 && pyenv install 3.12.1
RUN pyenv install 3.5.10 && pyenv install 3.6.15 && pyenv install 3.7.17 && pyenv install 3.8.20 && pyenv install 3.9.20 && pyenv install 3.10.15 && pyenv install 3.11.10 && pyenv install 3.12.7 && pyenv install 3.13.0

WORKDIR /app
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
author = 'Alex Dean, Paul Boocock, Matus Tomlein, Jack Keene'

# The full version, including alpha/beta/rc tags
release = "1.0.3"
release = "1.0.4"


# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -60,4 +60,4 @@
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ['_static']
5 changes: 3 additions & 2 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
pytest==4.6.11; python_version < '3.10.0'
pytest==6.2.5; python_version >= '3.10.0'
pytest==8.3.2; python_version >= '3.10.0'
attrs==21.2.0
httmock==1.4.0
freezegun==1.1.0
freezegun==1.1.0; python_version < '3.13'
freezegun==1.5.1; python_version >= '3.13'
pytest-cov
coveralls==3.3.1
42 changes: 28 additions & 14 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,68 +24,77 @@ function deploy {
source deactivate
fi

# pyenv install 3.6.14
# pyenv install 3.6.15
if [ ! -e ~/.pyenv/versions/tracker36 ]; then
pyenv virtualenv 3.6.14 tracker36
pyenv virtualenv 3.6.15 tracker36
pyenv activate tracker36
pip install .
pip install -r requirements-test.txt
source deactivate
fi

# pyenv install 3.7.11
# pyenv install 3.7.17
if [ ! -e ~/.pyenv/versions/tracker37 ]; then
pyenv virtualenv 3.7.11 tracker37
pyenv virtualenv 3.7.17 tracker37
pyenv activate tracker37
pip install .
pip install -r requirements-test.txt
source deactivate
fi

# pyenv install 3.8.11
# pyenv install 3.8.20
if [ ! -e ~/.pyenv/versions/tracker38 ]; then
pyenv virtualenv 3.8.11 tracker38
pyenv virtualenv 3.8.20 tracker38
pyenv activate tracker38
pip install .
pip install -r requirements-test.txt
source deactivate
fi

# pyenv install 3.9.6
# pyenv install 3.9.20
if [ ! -e ~/.pyenv/versions/tracker39 ]; then
pyenv virtualenv 3.9.6 tracker39
pyenv virtualenv 3.9.20 tracker39
pyenv activate tracker39
pip install .
pip install -r requirements-test.txt
source deactivate
fi

# pyenv install 3.10.1
# pyenv install 3.10.15
if [ ! -e ~/.pyenv/versions/tracker310 ]; then
pyenv virtualenv 3.10.1 tracker310
pyenv virtualenv 3.10.15 tracker310
pyenv activate tracker310
pip install .
pip install -r requirements-test.txt
source deactivate
fi

# pyenv install 3.11.0
# pyenv install 3.11.10
if [ ! -e ~/.pyenv/versions/tracker311 ]; then
pyenv virtualenv 3.11.0 tracker311
pyenv virtualenv 3.11.10 tracker311
pyenv activate tracker311
pip install .
pip install -r requirements-test.txt
source deactivate
fi

# pyenv install 3.12.0
# pyenv install 3.12.7
if [ ! -e ~/.pyenv/versions/tracker312 ]; then
pyenv virtualenv 3.12.0 tracker312
pyenv virtualenv 3.12.7 tracker312
pyenv activate tracker312
pip install .
pip install -r requirements-test.txt
source deactivate
fi

# pyenv install 3.13.0
if [ ! -e ~/.pyenv/versions/tracker313 ]; then
pyenv virtualenv 3.13.0 tracker313
pyenv activate tracker313
pip install .
pip install -r requirements-test.txt
source deactivate
fi
}


Expand Down Expand Up @@ -121,6 +130,10 @@ function run_tests {
pyenv activate tracker312
pytest
source deactivate

pyenv activate tracker313
pytest
source deactivate
}

function refresh_deploy {
Expand All @@ -132,6 +145,7 @@ function refresh_deploy {
pyenv uninstall -f tracker310
pyenv uninstall -f tracker311
pyenv uninstall -f tracker312
pyenv uninstall -f tracker313
}


Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

setup(
name="snowplow-tracker",
version="1.0.3",
version="1.0.4",
author=authors_str,
author_email=authors_email_str,
packages=["snowplow_tracker", "snowplow_tracker.test", "snowplow_tracker.events"],
Expand All @@ -64,6 +64,7 @@
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Operating System :: OS Independent",
],
install_requires=[
Expand Down
2 changes: 1 addition & 1 deletion snowplow_tracker/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
# language governing permissions and limitations there under.
# """

__version_info__ = (1, 0, 3)
__version_info__ = (1, 0, 4)
__version__ = ".".join(str(x) for x in __version_info__)
__build_version__ = __version__ + ""

0 comments on commit 7fd3d0a

Please sign in to comment.