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

Support python 3.11 #628

Merged
merged 2 commits into from
Oct 27, 2022
Merged
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -31,14 +31,14 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
# we do not want a large number of windows and macos builds, so
# enumerate them explicitly
include:
- os: windows-latest
python-version: "3.10"
python-version: "3.11"
- os: macos-latest
python-version: "3.10"
python-version: "3.11"
name: "test py${{ matrix.python-version }} on ${{ matrix.os }} "
runs-on: ${{ matrix.os }}
steps:
@@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.11"
- name: install tox
run: python -m pip install -U tox
- name: check package metadata
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ sphinx:
build:
os: ubuntu-20.04
tools:
python: "3.10"
python: "3.11"

python:
install:
1 change: 1 addition & 0 deletions changelog.d/20221027_192405_sirosen_add_3_11.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Python 3.11 is now officially supported (:pr:`NUMBER`)
2 changes: 2 additions & 0 deletions changelog.d/20221027_201213_sirosen_support_py311.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Add a `close()` method to `SQLiteAdapter` which closes the underlying
connection (:pr:`NUMBER`)
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -90,5 +90,6 @@ def read_readme():
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
],
)
6 changes: 6 additions & 0 deletions src/globus_sdk/tokenstorage/sqlite_adapter.py
Original file line number Diff line number Diff line change
@@ -100,6 +100,12 @@ def _init_and_connect(
conn.commit()
return conn

def close(self) -> None:
"""
Close the underlying database connection.
"""
self._connection.close()

def store_config(
self, config_name: str, config_dict: t.Mapping[str, t.Any]
) -> None:
80 changes: 49 additions & 31 deletions tests/functional/tokenstorage/test_sqlite.py
Original file line number Diff line number Diff line change
@@ -13,6 +13,24 @@ def db_filename(tempdir):
MEMORY_DBNAME = ":memory:"


@pytest.fixture
def adapters_to_close():
data = set()
yield data
for x in data:
x.close()


@pytest.fixture
def make_adapter(adapters_to_close):
def func(*args, **kwargs):
ret = SQLiteAdapter(*args, **kwargs)
adapters_to_close.add(ret)
return ret

return func


@pytest.mark.parametrize(
"success, use_file, kwargs",
[
@@ -26,79 +44,79 @@ def db_filename(tempdir):
(False, True, {"dbname": MEMORY_DBNAME, "namespace": "foo"}),
],
)
def test_constructor(success, use_file, kwargs, db_filename):
def test_constructor(success, use_file, kwargs, db_filename, make_adapter):
if success:
if use_file:
assert SQLiteAdapter(db_filename, **kwargs)
make_adapter(db_filename, **kwargs)
else:
assert SQLiteAdapter(**kwargs)
make_adapter(**kwargs)
else:
with pytest.raises(TypeError):
if use_file:
SQLiteAdapter(db_filename, **kwargs)
make_adapter(db_filename, **kwargs)
else:
SQLiteAdapter(**kwargs)
make_adapter(**kwargs)


def test_store_and_retrieve_simple_config():
adapter = SQLiteAdapter(MEMORY_DBNAME)
def test_store_and_retrieve_simple_config(make_adapter):
adapter = make_adapter(MEMORY_DBNAME)
store_val = {"val1": True, "val2": None, "val3": 1.4}
adapter.store_config("myconf", store_val)
read_val = adapter.read_config("myconf")
assert read_val == store_val
assert read_val is not store_val


def test_store_and_retrieve(mock_response):
adapter = SQLiteAdapter(MEMORY_DBNAME)
def test_store_and_retrieve(mock_response, make_adapter):
adapter = make_adapter(MEMORY_DBNAME)
adapter.store(mock_response)

data = adapter.get_by_resource_server()
assert data == mock_response.by_resource_server


def test_on_refresh_and_retrieve(mock_response):
def test_on_refresh_and_retrieve(mock_response, make_adapter):
"""just confirm that the aliasing of these functions does not change anything"""
adapter = SQLiteAdapter(MEMORY_DBNAME)
adapter = make_adapter(MEMORY_DBNAME)
adapter.on_refresh(mock_response)

data = adapter.get_by_resource_server()
assert data == mock_response.by_resource_server


def test_multiple_adapters_store_and_retrieve(mock_response, db_filename):
adapter1 = SQLiteAdapter(db_filename)
adapter2 = SQLiteAdapter(db_filename)
def test_multiple_adapters_store_and_retrieve(mock_response, db_filename, make_adapter):
adapter1 = make_adapter(db_filename)
adapter2 = make_adapter(db_filename)
adapter1.store(mock_response)

data = adapter2.get_by_resource_server()
assert data == mock_response.by_resource_server


def test_multiple_adapters_store_and_retrieve_different_namespaces(
mock_response, db_filename
mock_response, db_filename, make_adapter
):
adapter1 = SQLiteAdapter(db_filename, namespace="foo")
adapter2 = SQLiteAdapter(db_filename, namespace="bar")
adapter1 = make_adapter(db_filename, namespace="foo")
adapter2 = make_adapter(db_filename, namespace="bar")
adapter1.store(mock_response)

data = adapter2.get_by_resource_server()
assert data == {}


def test_load_missing_config_data():
adapter = SQLiteAdapter(MEMORY_DBNAME)
def test_load_missing_config_data(make_adapter):
adapter = make_adapter(MEMORY_DBNAME)
assert adapter.read_config("foo") is None


def test_load_missing_token_data():
adapter = SQLiteAdapter(MEMORY_DBNAME)
def test_load_missing_token_data(make_adapter):
adapter = make_adapter(MEMORY_DBNAME)
assert adapter.get_by_resource_server() == {}
assert adapter.get_token_data("resource_server_1") is None


def test_remove_tokens(mock_response):
adapter = SQLiteAdapter(MEMORY_DBNAME)
def test_remove_tokens(mock_response, make_adapter):
adapter = make_adapter(MEMORY_DBNAME)
adapter.store(mock_response)

removed = adapter.remove_tokens_for_resource_server("resource_server_1")
@@ -112,8 +130,8 @@ def test_remove_tokens(mock_response):
assert not removed


def test_remove_config():
adapter = SQLiteAdapter(MEMORY_DBNAME)
def test_remove_config(make_adapter):
adapter = make_adapter(MEMORY_DBNAME)
store_val = {"val1": True, "val2": None, "val3": 1.4}
adapter.store_config("myconf", store_val)
adapter.store_config("myconf2", store_val)
@@ -128,8 +146,8 @@ def test_remove_config():
assert not removed


def test_store_and_refresh(mock_response, mock_refresh_response):
adapter = SQLiteAdapter(MEMORY_DBNAME)
def test_store_and_refresh(mock_response, mock_refresh_response, make_adapter):
adapter = make_adapter(MEMORY_DBNAME)
adapter.store(mock_response)

# rs1 and rs2 data was stored correctly
@@ -146,10 +164,10 @@ def test_store_and_refresh(mock_response, mock_refresh_response):
assert data["access_token"] == "access_token_2_refreshed"


def test_iter_namespaces(mock_response, db_filename):
foo_adapter = SQLiteAdapter(db_filename, namespace="foo")
bar_adapter = SQLiteAdapter(db_filename, namespace="bar")
baz_adapter = SQLiteAdapter(db_filename, namespace="baz")
def test_iter_namespaces(mock_response, db_filename, make_adapter):
foo_adapter = make_adapter(db_filename, namespace="foo")
bar_adapter = make_adapter(db_filename, namespace="bar")
baz_adapter = make_adapter(db_filename, namespace="baz")

for adapter in [foo_adapter, bar_adapter, baz_adapter]:
assert list(adapter.iter_namespaces()) == []
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ envlist =
cov-clean
cov-combine
cov-report
py{310,39,38,37,36}
py{311,310,39,38,37,36}
py36-mindeps
skip_missing_interpreters = true
minversion = 3.0.0
@@ -71,9 +71,9 @@ deps = pyright
commands = pyright src/ {posargs}

[testenv:docs]
# force use of py310 for doc builds so that we get the same behaviors as the
# force use of py311 for doc builds so that we get the same behaviors as the
# readthedocs doc build
basepython = python3.10
basepython = python3.11
extras = dev
whitelist_externals = rm
changedir = docs/