Skip to content

Commit

Permalink
Merge branch 'master' into feature/use-encoding-from-webserver
Browse files Browse the repository at this point in the history
  • Loading branch information
DerDreschner committed Jan 17, 2025
2 parents 866f3fe + c1b0f88 commit 0570410
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 105 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"image": "mcr.microsoft.com/devcontainers/base:focal",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"features": {
"ghcr.io/devcontainers/features/python:1": {
"version": "3.12",
"toolsToInstall": "poetry, pre-commit"
"toolsToInstall": "poetry,pre-commit"
}
}
}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install poetry==1.8.3
pip install poetry==2.0.1
- name: Build package
run: poetry build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: '3.9'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install poetry==1.8.3
pip install poetry==2.0.1
poetry install
- name: Test with pytest
run: |
poetry run coverage run test.py
poetry run coverage xml
- name: 'Upload coverage to Codecov'
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
fail_ci_if_error: false
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
Expand Down
191 changes: 120 additions & 71 deletions poetry.lock

Large diffs are not rendered by default.

39 changes: 23 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
[tool.poetry]
[project]
name = "icalevents"
version = "0.1.29"
description = "Simple Python 3 library to download, parse and query iCal sources."
authors = ["Martin Eigenmann <[email protected]>", "Thomas Irgang <[email protected]>",
"Alexander Hultnér <[email protected]>"]
license = "MIT Licence"
authors = [
{ name = "Martin Eigenmann", email = "[email protected]" },
{ name = "Thomas Irgang", email = "[email protected]" },
{ name = "Alexander Hultnér", email = "[email protected]" },
]
readme = "README.md"
license = "MIT"
requires-python = ">=3.9"

dependencies = [
"icalendar (~=6.0)",
"python-dateutil (~=2.9)",
"pytz (>=2024.2)",
"urllib3 (>=1.26.5)",
]

[tool.poetry.dependencies]
python = "^3.9"
icalendar = "^6.0.0"
python-dateutil = "^2.9.0"
pytz = "^2024.1"
urllib3 = ">=1.26.5"
[tool.poetry]
requires-poetry = ">=2.0"

[tool.poetry.dev-dependencies]
coverage = "^6.0.1"
pytest = "^8.3.2"
black = "^24.3.0"
flake8 = "^5.0.4"
[tool.poetry.group.dev.dependencies]
coverage = "^7.6.10"
pytest = "^8.3.4"
black = "^24.10.0"
flake8 = "^7.1.1"
pook = "^2.1.3"

[build-system]
requires = ["poetry-core>=1.0.0"]
requires = ["poetry-core>=2.0"]
build-backend = "poetry.core.masonry.api"
7 changes: 1 addition & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,11 @@
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Operating System :: OS Independent",
"Topic :: Software Development :: Libraries :: Python Modules",
],
Expand Down

0 comments on commit 0570410

Please sign in to comment.