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

Replace appdirs with platformdirs #438

Merged
merged 2 commits into from
Dec 7, 2023
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
files: ^docs/.*\.rst$

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.6
rev: v0.1.7
hooks:
- id: ruff
args:
Expand Down
2 changes: 1 addition & 1 deletion a3m/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from typing import Any

import django_stubs_ext
from appdirs import user_data_dir
from platformdirs import user_data_dir

from a3m.appconfig import Config

Expand Down
35 changes: 35 additions & 0 deletions changelog.d/20231207_171522_jesus_platformdirs.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.. A new scriv changelog fragment.
..
.. Uncomment the header that is right (remove the leading dots).
..
.. Removed
.. -------
..
.. - A bullet item for the Removed category.
..
.. Added
.. -----
..
.. - A bullet item for the Added category.
..
Changed
-------

- Use ``platformdirs`` instead of ``appdirs`` to determine the user data
directory.
..
.. Deprecated
.. ----------
..
.. - A bullet item for the Deprecated category.
..
.. Fixed
.. -----
..
.. - A bullet item for the Fixed category.
..
.. Security
.. --------
..
.. - A bullet item for the Security category.
..
34 changes: 34 additions & 0 deletions changelog.d/20231207_173057_jesus_platformdirs.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.. A new scriv changelog fragment.
..
.. Uncomment the header that is right (remove the leading dots).
..
.. Removed
.. -------
..
.. - A bullet item for the Removed category.
..
.. Added
.. -----
..
.. - A bullet item for the Added category.
..
Changed
-------

- Update dependencies.
..
.. Deprecated
.. ----------
..
.. - A bullet item for the Deprecated category.
..
.. Fixed
.. -----
..
.. - A bullet item for the Fixed category.
..
.. Security
.. --------
..
.. - A bullet item for the Security category.
..
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies = [
# Infra
"prometheus_client~=0.17",
"requests~=2.31",
"appdirs~=1.4",
"platformdirs~=4.1",
"click~=8.1",
"rich~=13.6",
"tenacity~=8.2",
Expand Down
27 changes: 13 additions & 14 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ alabaster==0.7.13
# via sphinx
ammcpc==0.2.0
# via a3m (pyproject.toml)
appdirs==1.4.4
# via a3m (pyproject.toml)
asgiref==3.7.2
# via django
attrs==23.1.0
Expand All @@ -23,9 +21,9 @@ bagit==1.8.1
# via a3m (pyproject.toml)
bandit==1.7.5
# via a3m (pyproject.toml)
boto3==1.33.4
boto3==1.33.9
# via a3m (pyproject.toml)
botocore==1.33.4
botocore==1.33.9
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -63,11 +61,11 @@ cryptography==41.0.7
# via secretstorage
distlib==0.3.7
# via virtualenv
django==4.2.7
django==4.2.8
# via
# a3m (pyproject.toml)
# django-stubs-ext
django-stubs-ext==4.2.5
django-stubs-ext==4.2.7
# via a3m (pyproject.toml)
django-types==0.19.1
# via a3m (pyproject.toml)
Expand Down Expand Up @@ -103,13 +101,13 @@ grpcio-status==1.59.3
# via a3m (pyproject.toml)
grpcio-tools==1.59.3
# via a3m (pyproject.toml)
identify==2.5.32
identify==2.5.33
# via pre-commit
idna==3.6
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via twine
iniconfig==2.0.0
# via pytest
Expand Down Expand Up @@ -154,7 +152,7 @@ mypy==1.7.1
# via a3m (pyproject.toml)
mypy-extensions==1.0.0
# via mypy
nh3==0.2.14
nh3==0.2.15
# via readme-renderer
nodeenv==1.8.0
# via pre-commit
Expand All @@ -171,8 +169,9 @@ pip-tools==7.3.0
# via a3m (pyproject.toml)
pkginfo==1.9.6
# via twine
platformdirs==4.0.0
platformdirs==4.1.0
# via
# a3m (pyproject.toml)
# tox
# virtualenv
pluggy==1.3.0
Expand Down Expand Up @@ -226,7 +225,7 @@ pyyaml==6.0.1
# pre-commit
readme-renderer==42.0
# via twine
referencing==0.31.1
referencing==0.32.0
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -252,7 +251,7 @@ rpds-py==0.13.2
# via
# jsonschema
# referencing
ruff==0.1.6
ruff==0.1.7
# via a3m (pyproject.toml)
s3transfer==0.8.2
# via boto3
Expand Down Expand Up @@ -310,7 +309,7 @@ types-lxml==2023.10.21
# via a3m (pyproject.toml)
types-protobuf==4.24.0.4
# via a3m (pyproject.toml)
types-psycopg2==2.9.21.19
types-psycopg2==2.9.21.20
# via django-types
types-requests==2.31.0.10
# via a3m (pyproject.toml)
Expand All @@ -327,7 +326,7 @@ urllib3==2.0.7
# requests
# twine
# types-requests
virtualenv==20.24.7
virtualenv==20.25.0
# via
# pre-commit
# tox
Expand Down
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#
ammcpc==0.2.0
# via a3m (pyproject.toml)
appdirs==1.4.4
# via a3m (pyproject.toml)
asgiref==3.7.2
# via django
attrs==23.1.0
Expand All @@ -16,9 +14,9 @@ attrs==23.1.0
# referencing
bagit==1.8.1
# via a3m (pyproject.toml)
boto3==1.33.4
boto3==1.33.9
# via a3m (pyproject.toml)
botocore==1.33.4
botocore==1.33.9
# via
# boto3
# s3transfer
Expand All @@ -28,11 +26,11 @@ charset-normalizer==3.3.2
# via requests
click==8.1.7
# via a3m (pyproject.toml)
django==4.2.7
django==4.2.8
# via
# a3m (pyproject.toml)
# django-stubs-ext
django-stubs-ext==4.2.5
django-stubs-ext==4.2.7
# via a3m (pyproject.toml)
googleapis-common-protos==1.61.0
# via
Expand Down Expand Up @@ -68,6 +66,8 @@ mdurl==0.1.2
# via markdown-it-py
metsrw==0.5.0
# via a3m (pyproject.toml)
platformdirs==4.1.0
# via a3m (pyproject.toml)
prometheus-client==0.19.0
# via a3m (pyproject.toml)
protobuf==4.25.1
Expand All @@ -81,7 +81,7 @@ pygments==2.17.2
# via rich
python-dateutil==2.8.2
# via botocore
referencing==0.31.1
referencing==0.32.0
# via
# jsonschema
# jsonschema-specifications
Expand Down