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.

Sign up for GitHub

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

Facilitate tests and version upgrade #13

Merged
merged 5 commits into from
Jul 27, 2023
Merged

Facilitate tests and version upgrade #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e160ea
misc: properly call version attribute
gsilvapt Mar 30, 2023
8ddad53
Merge pull request #8 from surface-security/fix-version_attr
gsilvapt Mar 30, 2023
c44be3a
feat: add template sample to test app (#10)
gsilvapt Apr 12, 2023
8049654
Update Django version in pyproject.toml (#12)
pacuraro Jul 27, 2023
4fabdce
misc: version bump for new release
gsilvapt Jul 27, 2023
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 apitokens/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.1"
__version__ = "0.0.2"
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ classifiers = [
"Topic :: Software Development",
]
dependencies = [
"Django >= 3.1, < 4.0",
"Django >= 3.1, < 5.0",
"django-rest-knox == 4.2.0",
]

[tool.setuptools.dynamic]
version = {attr = "apitokens.VERSION"}
version = {attr = "apitokens.__version__"}

[tool.setuptools]
packages = ["apitokens"]
Expand Down
8 changes: 1 addition & 7 deletions testapp/testapp/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/

Expand All @@ -27,7 +26,6 @@

ALLOWED_HOSTS = []


# Application definition

INSTALLED_APPS = [
Expand Down Expand Up @@ -56,7 +54,7 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'DIRS': [BASE_DIR / 'testapp' / 'templates'],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand All @@ -71,7 +69,6 @@

WSGI_APPLICATION = 'testapp.wsgi.application'


# Database
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases

Expand All @@ -82,7 +79,6 @@
}
}


# Password validation
# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators

Expand All @@ -101,7 +97,6 @@
},
]


# Internationalization
# https://docs.djangoproject.com/en/3.2/topics/i18n/

Expand All @@ -115,7 +110,6 @@

USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.2/howto/static-files/

Expand Down
6 changes: 6 additions & 0 deletions testapp/testapp/templates/admin/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% extends "admin/base.html" %}

{% block userlinks %}
{{ block.super }}
/ <a href="{% url 'admin:apitokens_mytoken_changelist' %}">API Tokens</a>
{% endblock %}
Loading