Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and relock dependencies and constraints #483

Merged
merged 7 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
fail-fast: false
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
steps:
Expand All @@ -58,7 +57,6 @@ jobs:
fail-fast: false
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
connector:
Expand Down Expand Up @@ -99,7 +97,7 @@ jobs:
if: startsWith(github.event.ref, 'refs/tags')
strategy:
matrix:
python: [ 3.8 ]
python: [ 3.9 ]

steps:
- name: Fetch sqlalchemy_exasol code from repository
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
fail-fast: false
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
steps:
Expand All @@ -57,7 +56,6 @@ jobs:
fail-fast: false
matrix:
python:
- "3.8"
- "3.9"
- "3.10"
connector:
Expand Down Expand Up @@ -97,7 +95,7 @@ jobs:
needs: tests
strategy:
matrix:
python: [ 3.8 ]
python: [ 3.9 ]

steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: [3.8]
python: [3.9]

name: Check Links (Python-${{ matrix.python }})

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
Unreleased
==========

🗑️ Removed
----------
- Dropped python 3.8 support
* If you still depend on python 3.8 use the 5.x version line

🧰 Internal
-----------
- Remove testing against Exasol 7.0
Expand Down
4 changes: 2 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
class Settings:
CONNECTORS = ("pyodbc", "turbodbc", "websocket")
ENVIRONMENT_NAME = "test"
DB_PORT = 8888
BUCKETFS_PORT = 6666
DB_PORT = 8563
BUCKETFS_PORT = 2580
VERSION_FILE = PROJECT_ROOT / "sqlalchemy_exasol" / "version.py"
DB_VERSIONS = ("7.1.17",)

Expand Down
470 changes: 244 additions & 226 deletions poetry.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ classifiers = [
"Intended Audience :: Information Technology",
"Programming Language :: SQL",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Topic :: Database",
Expand Down Expand Up @@ -60,9 +59,9 @@ exclude = []


[tool.poetry.dependencies]
python = ">=3.8,<4.0"
python = ">=3.9,<4.0"
packaging = ">=21.3"
pyexasol = "^0.25.1"
pyexasol = ">=0.25.1,<1"
sqlalchemy = ">=1.4,<2"

[tool.poetry.dependencies.turbodbc]
Expand All @@ -79,7 +78,7 @@ urlscan = ">=0.9.9"
pytest-json-report = ">=1.5.0"
# The excluded versions mirror the excluded versions of sqla 1.3.X.
# The limitation/issue pytest <6 is tracked in https://github.com/exasol/sqlalchemy-exasol/issues/144
pytest = ">=6"
pytest = ">=6,<9"
pytest-cov = ">=2.7.0"
pre-commit = ">=2.19.0"
black = ">=22.6.0"
Expand All @@ -91,9 +90,10 @@ sphinx-copybutton = "^0.5.0"
mypy = ">=0.982"
pyupgrade = ">=3.0.0"
rich = "^13.3.1"
exasol-integration-test-docker-environment = "^1.5.0"
exasol-integration-test-docker-environment = "^3.1.0"
pytest-history = ">=0.2.0"
pyodbc = ">=4.0.34,<6"
pytest-exasol-itde = ">=0.2.0,<1"

[tool.poetry.extras]
pyodbc = ["pyodbc"]
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[db]
exasol-pyodbc=exa+pyodbc://sys:exasol@localhost:8888/TEST?CONNECTIONCALL=en_US.UTF-8&DRIVER=EXAODBC&SSLCertificate=SSL_VERIFY_NONE
exasol-turbodbc=exa+turbodbc://sys:exasol@localhost:8888/TEST?CONNECTIONCALL=en_US.UTF-8&DRIVER=EXAODBC&SSLCertificate=SSL_VERIFY_NONE
exasol-websocket=exa+websocket://sys:exasol@localhost:8888/TEST?CONNECTIONCALL=en_US.UTF-8&DRIVER=EXAODBC&SSLCertificate=SSL_VERIFY_NONE
exasol-pyodbc=exa+pyodbc://sys:exasol@localhost:8563/TEST?CONNECTIONCALL=en_US.UTF-8&DRIVER=EXAODBC&SSLCertificate=SSL_VERIFY_NONE
exasol-turbodbc=exa+turbodbc://sys:exasol@localhost:8563/TEST?CONNECTIONCALL=en_US.UTF-8&DRIVER=EXAODBC&SSLCertificate=SSL_VERIFY_NONE
exasol-websocket=exa+websocket://sys:exasol@localhost:8563/TEST?CONNECTIONCALL=en_US.UTF-8&DRIVER=EXAODBC&SSLCertificate=SSL_VERIFY_NONE

[sqla_testing]
requirement_cls=sqlalchemy_exasol.requirements:Requirements
Expand Down
2 changes: 1 addition & 1 deletion test/integration/exasol/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@


@contextmanager
def _connection(dsn="localhost:8888", user="SYS", password="exasol"):
def _connection(dsn="localhost:8563", user="SYS", password="exasol"):
connection = pyexasol.connect(
dsn=dsn,
user=user,
Expand Down
2 changes: 1 addition & 1 deletion test/integration/sqlalchemy/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@


@contextmanager
def _connection(dsn="localhost:8888", user="SYS", password="exasol"):
def _connection(dsn="localhost:8563", user="SYS", password="exasol"):
connection = pyexasol.connect(
dsn=dsn,
user=user,
Expand Down
Loading