diff --git a/Dockerfile b/Dockerfile index 5a3e8450..b1244652 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ FROM index.docker.io/library/python:slim WORKDIR /app # Copy the code -ADD manage.py deploy/requirements.txt deploy/settings.py setup.py urls.py deploy/wsgi.py /app/ +ADD manage.py deploy/requirements.txt deploy/settings.py urls.py deploy/wsgi.py /app/ ADD silverstrike /app/silverstrike # install deps RUN apt-get update -y && apt-get install -y gcc libmariadb-dev python3-dev libffi-dev pkg-config && \ - pip install --no-cache-dir -r requirements.txt && python setup.py install && apt-get remove -y gcc pkg-config && apt-get autoremove -y + pip install --no-cache-dir -r requirements.txt && apt-get remove -y gcc pkg-config && apt-get autoremove -y # configure uwsgi and django ENV DJANGO_SETTINGS_MODULE=settings UWSGI_WSGI_FILE=wsgi.py UWSGI_HTTP=:8000 UWSGI_MASTER=1 UWSGI_WORKERS=2 UWSGI_THREADS=8 UWSGI_LAZY_APPS=1 UWSGI_WSGI_ENV_BEHAVIOR=holy diff --git a/deploy/requirements.txt b/deploy/requirements.txt index ea0da4e4..fb5e6218 100644 --- a/deploy/requirements.txt +++ b/deploy/requirements.txt @@ -1,3 +1,10 @@ +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 whitenoise uwsgi psycopg2-binary diff --git a/setup.py b/setup.py deleted file mode 100644 index 5796f777..00000000 --- a/setup.py +++ /dev/null @@ -1,58 +0,0 @@ -from os import path -import re -from setuptools import setup, find_packages - -here = path.abspath(path.dirname(__file__)) - - -def get_version(): - """ - Return package version as listed in `__version__` in `init.py`. - """ - init_py = open(path.join(here, 'silverstrike', '__init__.py')).read() - return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1) - - -version = get_version() -long_description = """SilverStrike is a Django based webapp to help you -manage your personal finances. -""" - -setup( - name='silverstrike', - version=version, - description='Django webapp to manage personal finances', - long_description=long_description, - author='Simon Hanna', - url='https://github.com/agstrike/silverstrike', - license='MIT', - packages=['silverstrike'], - include_package_data=True, - install_requires=[ - 'django>=5.1', - 'djangorestframework>=3.12', - 'django-widgets-improved', - 'django-allauth>=65.1', - 'python-dateutil', - 'pytz', - 'django-cors-headers>=4.6', - ], - extras_require={ - 'OFX Importing': ['ofxparse'], - }, - classifiers=[ - 'Development Status :: 3 - Alpha', - 'Framework :: Django', - 'Framework :: Django :: 4.1', - 'Intended Audience :: End Users/Desktop', - 'License :: OSI Approved :: MIT License', - 'Operating System :: POSIX', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - ], - keywords='finance django money money-manager', - python_requires='>=3.8', -) -