Skip to content

Commit

Permalink
Empty-Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
john-bodley committed Jul 27, 2022
1 parent 8771242 commit 8cca8e3
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 61 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install libkrb5-dev
sudo curl -sSL https://install.python-poetry.org | python3 - --preview
poetry install --only=dev
sudo curl -sSL https://install.python-poetry.org | python3
poetry install --dev-only
- name: Run tox
run: |
poetry run tox --parallel
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ repos:
- "types-requests"

- repo: "https://github.com/python-poetry/poetry"
rev: "1.2.0b3"
rev: "1.1.14"
hooks:
- id: poetry-check
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ the [`JWT` authentication type](https://trino.io/docs/current/security/jwt.html)
from sqlalchemy import create_engine

engine = create_engine("trino://<username>@<host>:<port>/<catalog>/<schema>?access_token=<jwt_token>")

# or
from trino.auth import JWTAuthentication
engine = create_engine(
Expand Down Expand Up @@ -419,10 +419,10 @@ Start by forking the repository and then modify the code in your fork.

Clone the repository and go inside the code directory.

Python dependencies are managed using [Poetry](https://python-poetry.org/) which helps to ensure the project is managed in a deterministic way. Poetry [creates a virtual environment](https://python-poetry.org/docs/managing-environments/) to aid with the process. Currently this project uses [dependency groups](https://python-poetry.org/docs/master/managing-dependencies/) which are a pre-release feature (denoted by the `--preview` flag) and thus Poetry should be installed via:
Python dependencies are managed using [Poetry](https://python-poetry.org/) which helps to ensure the project is managed in a deterministic way. Poetry [creates a virtual environment](https://python-poetry.org/docs/managing-environments/) to aid with the process. Poetry should be installed via:

```
$ curl -sSL https://install.python-poetry.org | python3 - --preview
$ curl -sSL https://install.python-poetry.org | python3
```

When the code is ready, submit a Pull Request.
Expand Down Expand Up @@ -477,7 +477,7 @@ poetry run tox -e pre-commit
```bash
git fetch -a && git status
```
- Change version in `trino/__init__.py` to a new version, e.g. `0.123.0`.
- Change version in `trino/pyproject.toml` to a new version, e.g. `0.123.0`.
- Commit
```bash
git commit -a -m "Bump version to 0.123.0"
Expand Down
61 changes: 20 additions & 41 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 16 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry-core>=1.1.0b3"]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down Expand Up @@ -44,23 +44,28 @@ requests = "*"
requests_kerberos = { version = "*", optional = true }
sqlalchemy = { version = "~1.4", optional = true }

[tool.poetry.extras]
external-authentication-token-cache = ["keyring"]
kerberos = ["requests_kerberos"]
sqlalchemy = ["sqlalchemy"]

[tool.poetry.group.dev]
optional = true

[tool.poetry.group.dev.dependencies]
[tool.poetry.dev-dependencies]
# In Poetry 1.2 these should be defined via:
#
# [tool.poetry.group.dev]
# optional = true
#
# [tool.poetry.group.dev.dependencies]
pre-commit = "*"
tox = "*"
tox-gh-actions = "*"

[tool.poetry.group.test.dependencies]
# In Poetry 1.2 these should be defined via:
#
# [tool.poetry.group.test.dependencies]
click = "*"
httpretty = "<1.1"
pytest = "*"

[tool.poetry.extras]
external-authentication-token-cache = ["keyring"]
kerberos = ["requests_kerberos"]
sqlalchemy = ["sqlalchemy"]

[tool.poetry.plugins."sqlalchemy.dialects"]
trino = "trino.sqlalchemy.dialect:TrinoDialect"
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ parallel_show_output = true

[testenv:pre-commit]
commands =
poetry install --only=dev
poetry install --dev-only
poetry run pre-commit run --all-files --show-diff-on-failure

[tox]
Expand Down
1 change: 0 additions & 1 deletion trino/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@
from . import logging

__all__ = ['auth', 'dbapi', 'client', 'constants', 'exceptions', 'logging']

0 comments on commit 8cca8e3

Please sign in to comment.