Skip to content

Commit

Permalink
Use emmett-core (#507)
Browse files Browse the repository at this point in the history
  • Loading branch information
gi0baro authored Oct 9, 2024
1 parent 7014464 commit 6c58b96
Show file tree
Hide file tree
Showing 82 changed files with 698 additions and 8,062 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,24 @@ on:
jobs:
publish:
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/emmett
permissions:
id-token: write

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install and configure Poetry
uses: gi0baro/setup-poetry-bin@v1
with:
virtualenvs-in-project: true
- name: Publish
python-version: 3.12
- name: Install uv
uses: astral-sh/setup-uv@v3
- name: Build distributions
run: |
poetry build
poetry publish
env:
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
uv build
- name: Publish package to pypi
uses: pypa/gh-action-pypi-publish@release/v1
with:
skip-existing: true
42 changes: 19 additions & 23 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ jobs:
Linux:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12', '3.13']

services:
postgres:
Expand All @@ -30,63 +31,58 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
uses: gi0baro/setup-poetry-bin@v1
with:
virtualenvs-in-project: true
- name: Install uv
uses: astral-sh/setup-uv@v3
- name: Install dependencies
run: |
poetry install -v
uv sync --dev
- name: Test
env:
POSTGRES_URI: postgres:postgres@localhost:5432/test
run: |
poetry run pytest -v tests
uv run pytest -v tests
MacOS:
runs-on: macos-13
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12', '3.13']

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
uses: gi0baro/setup-poetry-bin@v1
with:
virtualenvs-in-project: true
- name: Install uv
uses: astral-sh/setup-uv@v3
- name: Install dependencies
run: |
poetry install -v
uv sync --dev
- name: Test
run: |
poetry run pytest -v tests
uv run pytest -v tests
Windows:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
python-version: [3.8, 3.9, '3.10', '3.11', '3.12', '3.13']

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install and configure Poetry
uses: gi0baro/setup-poetry-bin@v1
with:
virtualenvs-in-project: true
- name: Install uv
uses: astral-sh/setup-uv@v3
- name: Install dependencies
shell: bash
run: |
poetry install -v
uv sync --dev
- name: Test
shell: bash
run: |
poetry run pytest -v tests
uv run pytest -v tests
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ build/*
dist/*
Emmett.egg-info/*
poetry.lock
uv.lock

examples/*/databases
examples/*/logs
Expand Down
1 change: 1 addition & 0 deletions emmett/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from . import _internal
from .app import App, AppModule
from .cache import Cache
from .ctx import current
Expand Down
2 changes: 1 addition & 1 deletion emmett/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.5.13"
__version__ = "2.6.0"
Loading

0 comments on commit 6c58b96

Please sign in to comment.