Skip to content

Commit

Permalink
feat: removing django-includes from dependencies as one can install it
Browse files Browse the repository at this point in the history
  • Loading branch information
hartym committed Feb 1, 2021
1 parent 404d20b commit 9480beb
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 47 deletions.
1 change: 0 additions & 1 deletion Projectfile
Expand Up @@ -24,7 +24,6 @@ with require("python") as python:
"brotli ~=1.0.9",
"django ~=3.1,<3.2",
"django-allauth ~=0.44.0",
"django-includes ~=0.3.1",
"jinja2 ~=2.11",
"mondrian ~=0.8",
"whitenoise ~=5.2.0",
Expand Down
4 changes: 1 addition & 3 deletions django_zero/commands/create.py
Expand Up @@ -88,9 +88,7 @@ def handle_project(self, *args, **options):
try:
UpdateCommand.handle("Projectfile")
os.system("git add --all .")
os.system(
'git commit --amend -m "Project initialized using Medikit, Cookiecutter and Django-Zero."'
)
os.system('git commit --amend -m "Project initialized using Medikit, Cookiecutter and Django-Zero."')
finally:
logging.getLogger().setLevel(logging.INFO)
os.chdir(oldwd)
Expand Down
6 changes: 3 additions & 3 deletions django_zero/commands/lifecycle.py
Expand Up @@ -69,9 +69,9 @@ def handle(self, *, bind=None, collectstatic=False, hot=False, hot_only=False, p
check_installed()

if not bind:
host = os.environ.get('HOST', "127.0.0.1")
port = os.environ.get('PORT', "8000")
bind = host + ':' + port
host = os.environ.get("HOST", "127.0.0.1")
port = os.environ.get("PORT", "8000")
bind = host + ":" + port

m = create_honcho_manager(mode="dev", bind=bind, hot=hot, hot_only=hot_only, environ={"DJANGO_DEBUG": "1"})

Expand Down
5 changes: 1 addition & 4 deletions requirements.txt
@@ -1,24 +1,21 @@
-e .
asgiref==3.3.1
brotli==1.0.9
cachecontrol==0.12.6
certifi==2020.12.5
cffi==1.14.4
chardet==4.0.0
colorama==0.4.4
cryptography==3.3.1
defusedxml==0.6.0
django-allauth==0.44.0
django-includes==0.3.1
django==3.1.5
idna==2.10
jinja2==2.11.3
markupsafe==1.1.1
mondrian==0.8.1
msgpack==1.0.2
oauthlib==3.1.0
pycparser==2.20
pyjwt[crypto]==1.7.1
pyjwt[crypto]==2.0.1
python3-openid==3.2.0
pytz==2021.1
requests-oauthlib==1.3.0
Expand Down
76 changes: 40 additions & 36 deletions setup.py
Expand Up @@ -2,10 +2,11 @@
# All changes will be overriden.
# Edit Projectfile and run “make update” (or “medikit update”) to regenerate.

from setuptools import setup, find_packages
from codecs import open
from os import path

from setuptools import find_packages, setup

here = path.abspath(path.dirname(__file__))

# Py3 compatibility hacks, borrowed from IPython.
Expand All @@ -20,63 +21,66 @@ def execfile(fname, globs, locs=None):

# Get the long description from the README file
try:
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
with open(path.join(here, "README.rst"), encoding="utf-8") as f:
long_description = f.read()
except:
long_description = ''
long_description = ""

# Get the classifiers from the classifiers file
tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split('\n'))))
tolines = lambda c: list(filter(None, map(lambda s: s.strip(), c.split("\n"))))
try:
with open(path.join(here, 'classifiers.txt'), encoding='utf-8') as f:
with open(path.join(here, "classifiers.txt"), encoding="utf-8") as f:
classifiers = tolines(f.read())
except:
classifiers = []

version_ns = {}
try:
execfile(path.join(here, 'django_zero/_version.py'), version_ns)
execfile(path.join(here, "django_zero/_version.py"), version_ns)
except EnvironmentError:
version = 'dev'
version = "dev"
else:
version = version_ns.get('__version__', 'dev')
version = version_ns.get("__version__", "dev")

setup(
author='Romain Dorgueil',
author_email='romain@dorgueil.net',
description='Zero-configuration django projects.',
license='Apache License, Version 2.0',
name='django_zero',
author="Romain Dorgueil",
author_email="romain@dorgueil.net",
description="Zero-configuration django projects.",
license="Apache License, Version 2.0",
name="django_zero",
version=version,
long_description=long_description,
classifiers=classifiers,
packages=find_packages(exclude=['ez_setup', 'example', 'test']),
packages=find_packages(exclude=["ez_setup", "example", "test"]),
include_package_data=True,
install_requires=[
'brotli ~= 1.0.9', 'django ~= 3.1, < 3.2', 'django-allauth ~= 0.44.0',
'django-includes ~= 0.3.1', 'jinja2 ~= 2.11', 'mondrian ~= 0.8',
'whitenoise ~= 5.2.0'
"brotli ~= 1.0.9",
"django ~= 3.1, < 3.2",
"django-allauth ~= 0.44.0",
"jinja2 ~= 2.11",
"mondrian ~= 0.8",
"whitenoise ~= 5.2.0",
],
extras_require={
'celery': [
'celery ~= 5.0', 'django_celery_beat ~= 2.2.0',
'django_celery_results ~= 2.0.0'
],
'channels': ['channels ~= 3.0.0', 'daphne ~= 3.0.0'],
'dev': [
'cookiecutter ~= 1.7', 'coverage ~= 5.3',
'django-extensions ~= 3.1', 'django_debug_toolbar ~= 3.2',
'honcho ~= 1.0', 'isort', 'medikit ~= 0.7', 'pyquery ~= 1.4',
'pytest >= 5.4.0', 'pytest-cov ~= 2.7', 'pytest-django ~= 4.0',
'werkzeug ~= 1.0'
"celery": ["celery ~= 5.0", "django_celery_beat ~= 2.2.0", "django_celery_results ~= 2.0.0"],
"channels": ["channels ~= 3.0.0", "daphne ~= 3.0.0"],
"dev": [
"cookiecutter ~= 1.7",
"coverage ~= 5.3",
"django-extensions ~= 3.1",
"django_debug_toolbar ~= 3.2",
"honcho ~= 1.0",
"isort",
"medikit ~= 0.7",
"pyquery ~= 1.4",
"pytest >= 5.4.0",
"pytest-cov ~= 2.7",
"pytest-django ~= 4.0",
"werkzeug ~= 1.0",
],
'prod': ['gunicorn ~= 20.0']
},
entry_points={
'console_scripts': ['django-zero = django_zero.commands:main']
"prod": ["gunicorn ~= 20.0"],
},
url='https://github.com/hartym/django-zero',
download_url=
'https://github.com/hartym/django-zero/archive/{version}.tar.gz'.format(
version=version),
entry_points={"console_scripts": ["django-zero = django_zero.commands:main"]},
url="https://github.com/hartym/django-zero",
download_url="https://github.com/hartym/django-zero/archive/{version}.tar.gz".format(version=version),
)

0 comments on commit 9480beb

Please sign in to comment.