From 682d0f5fcd7073a0c54cd1dd342e957b382b2f29 Mon Sep 17 00:00:00 2001 From: G8s Bot Date: Thu, 24 Nov 2022 17:24:37 +0800 Subject: [PATCH 1/2] fix #21 cannot install with poetry --- setup.py | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/setup.py b/setup.py index 178866d..6263c11 100755 --- a/setup.py +++ b/setup.py @@ -4,36 +4,36 @@ from setuptools import setup -if sys.version_info < (3, 4): - install_requires = ['Django>=1.8,<2.0'] -else: - install_requires = ['Django>=1.8,!=2.0,!=2.0.1,!=2.0.2,!=2.0.3,!=2.0.4,!=2.0.5,!=2.0.6,!=2.0.7,!=2.0.8,!=2.0.9'] +install_requires = [ + 'Django>=1.8,<2.0;python_version<"3.4"', + 'Django>=1.8,!=2.0,!=2.0.1,!=2.0.2,!=2.0.3,!=2.0.4,!=2.0.5,!=2.0.6,!=2.0.7,!=2.0.8,!=2.0.9; python_version>="3.4"', +] setup( - name='django-hashedfilenamestorage', - version='2.4.1', - description=('A Django storage backend that names files by hash value.'), - long_description=open('README.rst', 'r').read(), - author='Ecometrica', - author_email='info@ecometrica.com', - url='http://github.com/ecometrica/django-hashedfilenamestorage/', - packages=['django_hashedfilenamestorage'], + name="django-hashedfilenamestorage", + version="2.4.1", + description=("A Django storage backend that names files by hash value."), + long_description=open("README.rst", "r").read(), + author="Ecometrica", + author_email="info@ecometrica.com", + url="http://github.com/ecometrica/django-hashedfilenamestorage/", + packages=["django_hashedfilenamestorage"], install_requires=install_requires, classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Web Environment', - 'Framework :: Django', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Topic :: Software Development :: Libraries', + "Development Status :: 5 - Production/Stable", + "Environment :: Web Environment", + "Framework :: Django", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Topic :: Software Development :: Libraries", ], zip_safe=True, - tests_require=['pytest', 'tox'] + tests_require=["pytest", "tox"], ) From bcaa5e20f13fc6155c47913b80d6fdba4ae2b0eb Mon Sep 17 00:00:00 2001 From: G8s Bot Date: Thu, 24 Nov 2022 17:26:09 +0800 Subject: [PATCH 2/2] don't auto format --- setup.py | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/setup.py b/setup.py index 6263c11..7b482c6 100755 --- a/setup.py +++ b/setup.py @@ -6,34 +6,33 @@ install_requires = [ 'Django>=1.8,<2.0;python_version<"3.4"', - 'Django>=1.8,!=2.0,!=2.0.1,!=2.0.2,!=2.0.3,!=2.0.4,!=2.0.5,!=2.0.6,!=2.0.7,!=2.0.8,!=2.0.9; python_version>="3.4"', + 'Django>=1.8,!=2.0,!=2.0.1,!=2.0.2,!=2.0.3,!=2.0.4,!=2.0.5,!=2.0.6,!=2.0.7,!=2.0.8,!=2.0.9;python_version>="3.4"', ] - setup( - name="django-hashedfilenamestorage", - version="2.4.1", - description=("A Django storage backend that names files by hash value."), - long_description=open("README.rst", "r").read(), - author="Ecometrica", - author_email="info@ecometrica.com", - url="http://github.com/ecometrica/django-hashedfilenamestorage/", - packages=["django_hashedfilenamestorage"], + name='django-hashedfilenamestorage', + version='2.4.1', + description=('A Django storage backend that names files by hash value.'), + long_description=open('README.rst', 'r').read(), + author='Ecometrica', + author_email='info@ecometrica.com', + url='http://github.com/ecometrica/django-hashedfilenamestorage/', + packages=['django_hashedfilenamestorage'], install_requires=install_requires, classifiers=[ - "Development Status :: 5 - Production/Stable", - "Environment :: Web Environment", - "Framework :: Django", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Topic :: Software Development :: Libraries", + 'Development Status :: 5 - Production/Stable', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Topic :: Software Development :: Libraries', ], zip_safe=True, - tests_require=["pytest", "tox"], + tests_require=['pytest', 'tox'] )