forked from Lainports/freebsd-ports
cee758de85
* Also switch the port to Django 2.2 (current LTS release) because Django 1.11 is End-of-Life since April, which also drops the support for Python 2.7. * Do the same for www/py-django-tagging and bump PORTREVISION due changed dependencies. [1] * Relax the version requirements in setup.py to pave the way for the 0.5.0 update of www/py-django-tagging. [1] * Remove superfluous '+=' from SUB_LIST and PLIST_SUB and sort variables a bit according to the PHB. * Add NO_ARCH as there are no architecture relevant files in the package. Changelogs since 1.1.5: https://github.com/graphite-project/graphite-web/releases/tag/1.1.7 https://github.com/graphite-project/graphite-web/releases/tag/1.1.6 PR: 245873 245843 [1] Approved by: maintainer timeout (6+ weeks), Kevin Golding (maintainer) [1]
47 lines
1.8 KiB
Python
47 lines
1.8 KiB
Python
--- setup.py.orig 2020-03-16 15:55:20 UTC
|
|
+++ setup.py
|
|
@@ -39,10 +39,6 @@ else:
|
|
cf.add_section('install')
|
|
except DuplicateSectionError:
|
|
pass
|
|
- if not cf.has_option('install', 'prefix'):
|
|
- cf.set('install', 'prefix', '/opt/graphite')
|
|
- if not cf.has_option('install', 'install-lib'):
|
|
- cf.set('install', 'install-lib', '%(prefix)s/webapp')
|
|
|
|
with open('setup.cfg', 'w') as f:
|
|
cf.write(f)
|
|
@@ -58,17 +54,17 @@ else:
|
|
|
|
storage_dirs = []
|
|
|
|
-for subdir in ('whisper/dummy.txt', 'ceres/dummy.txt', 'rrd/dummy.txt', 'log/dummy.txt', 'log/webapp/dummy.txt'):
|
|
- storage_dirs.append( ('storage/%s' % subdir, []) )
|
|
+for subdir in ('whisper', 'ceres', 'rrd', 'log', 'log/webapp'):
|
|
+ storage_dirs.append( ('graphite/storage/%s' % subdir, []) )
|
|
|
|
webapp_content = defaultdict(list)
|
|
|
|
-for root, dirs, files in os.walk('webapp/content'):
|
|
+for root, dirs, files in os.walk('graphite/webapp/content'):
|
|
for filename in files:
|
|
filepath = os.path.join(root, filename)
|
|
webapp_content[root].append(filepath)
|
|
|
|
-conf_files = [ ('conf', glob('conf/*.example')) ]
|
|
+conf_files = [ ('%%PREFIX%%/etc/graphite', glob('conf/*.example')) ]
|
|
examples = [ ('examples', glob('examples/example-*')) ]
|
|
|
|
|
|
@@ -116,8 +112,9 @@ try:
|
|
package_data={'graphite' :
|
|
['templates/*', 'local_settings.py.example']},
|
|
scripts=glob('bin/*'),
|
|
- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
|
|
- install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz',
|
|
+ data_files=list(conf_files),
|
|
+
|
|
+ install_requires=['Django>=1.8,<3.1', 'django-tagging>=0.4.3', 'pytz',
|
|
'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
|
|
classifiers=[
|
|
'Intended Audience :: Developers',
|