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 #150

Merged
merged 4 commits into from
Oct 31, 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
22 changes: 9 additions & 13 deletions .github/workflows/test_and_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.8, 3.9, '3.10']
python: [3.11, 3.12]
tox: [django, flake, codecov]
exclude:
- python: 3.8
- python: 3.11
tox: flake
- python: 3.8
tox: codecov
- python: 3.9
tox: flake
- python: 3.9
- python: 3.11
tox: codecov
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install dependencies
Expand All @@ -40,21 +36,21 @@ jobs:
steps:

- name: Check Out Repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: simhnna
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./
file: ./Dockerfile
Expand Down
1 change: 1 addition & 0 deletions deploy/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'allauth.account.middleware.AccountMiddleware',
]

ROOT_URLCONF = 'urls'
Expand Down
7 changes: 7 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Django>=5.1.2
django-allauth>=65.1.0
django-cors-headers>=4.6.0
django-widgets-improved>=1.5.0
djangorestframework>=3.15.2
python-dateutil>=2.9.0.post0
pytz>=2024.2
3 changes: 2 additions & 1 deletion settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import os

# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data')
BASE_DIR = os.path.dirname(os.path.abspath(__file__))


# Quick-start development settings - unsuitable for production
Expand Down Expand Up @@ -60,6 +60,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'allauth.account.middleware.AccountMiddleware',
]

CORS_ORIGIN_WHITELIST = (
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ def get_version():
packages=['silverstrike'],
include_package_data=True,
install_requires=[
'django>=4.1',
'django>=5.1',
'djangorestframework>=3.12',
'django-widgets-improved',
'django-allauth>=0.40',
'django-allauth>=65.1',
'python-dateutil',
'pytz',
'django-cors-headers>=3.5',
'django-cors-headers>=4.6',
],
extras_require={
'OFX Importing': ['ofxparse'],
Expand Down
6 changes: 2 additions & 4 deletions silverstrike/static/silverstrike/js/jquery.min.js

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions silverstrike/static/vendor/js/jquery.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ envlist = django, flake, coverage
usedevelop = True
basepython = python3
deps =
django: Django>=4.1,<4.2
django: Django>=5.1,<5.2
ofxparse
commands =
python manage.py test {posargs:silverstrike}
Expand Down