github-starred/burp-ui
2
0
Fork 0
mirror of https://github.com/ziirish/burp-ui.git synced 2026-05-21 06:45:24 -06:00
Code Issues 1 Projects Packages Wiki Activity Actions

fix: requirements conflict between burp-ui and burp-ui-agent

Browse source
This commit is contained in:
ziirish 2018-01-20 10:23:39 +01:00
parent d1f5bcd938
commit adfa31ac6d
No known key found for this signature in database
GPG key ID: 72DB229A64B54E46
5 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pkgs/burp-ui-agent/setup.py
View file

@ -18,14 +18,28 @@ if 'sdist' in sys.argv or 'bdist' in sys.argv:
if os.path.exists(os.path.join(ROOT, 'burpui', 'VERSION')): if os.path.exists(os.path.join(ROOT, 'burpui', 'VERSION')):
shutil.copyfile(os.path.join(ROOT, 'burpui', 'VERSION'), 'burpui_agent/VERSION') shutil.copyfile(os.path.join(ROOT, 'burpui', 'VERSION'), 'burpui_agent/VERSION')
rev = 'stable' rev = 'stable'
if os.path.exists(os.path.join(ROOT, '.git/HEAD')): ci = os.getenv('CI')
commit = os.getenv('CI_COMMIT_SHA')
if not ci and os.path.exists(os.path.join(ROOT, '.git/HEAD')):
try: try:
branch = subprocess.check_output('sed s@^.*/@@g {}/.git/HEAD'.format(ROOT).split()).rstrip() branch = subprocess.check_output('sed s@^.*/@@g {}/.git/HEAD'.format(ROOT).split()).rstrip()
ver = open(os.path.join('burpui_agent', 'VERSION')).read().rstrip() ver = open(os.path.join('burpui_agent', 'VERSION')).read().rstrip()
if branch and 'dev' in ver: if branch and 'dev' in ver:
rev = branch rev = branch
try: try:
with open('burpui_agent/RELEASE', 'w') as f: with open('burpui_agent/RELEASE', 'wb') as f:
f.write(rev)
except:
pass
except:
pass
elif ci:
try:
ver = open(os.path.join('burpui_agent', 'VERSION')).read().rstrip()
if 'dev' in ver:
rev = commit
try:
with open('burpui_agent/RELEASE', 'wb') as f:
f.write(rev) f.write(rev)
except: except:
pass pass
@ -102,10 +116,10 @@ setup(
'arrow==0.10.0', 'arrow==0.10.0',
'tzlocal==1.4', 'tzlocal==1.4',
'six==1.10.0', 'six==1.10.0',
'pyOpenSSL==17.0.0', 'pyOpenSSL>=17.2.0',
'configobj==5.0.6', 'configobj==5.0.6',
'pyasn1==0.2.3', 'pyasn1>=0.2.3',
'cffi==1.10.0', 'cffi>=1.10.0',
], ],
classifiers=[ classifiers=[
'Framework :: Flask', 'Framework :: Flask',
@ -115,7 +129,7 @@ setup(
'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: Linux',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.6',
'Topic :: System :: Archiving :: Backup', 'Topic :: System :: Archiving :: Backup',
'Topic :: System :: Monitoring', 'Topic :: System :: Monitoring',
] ]

4
pkgs/burp-ui-extra/setup.py
View file

@ -42,7 +42,7 @@ setup(
'burp-ui>={}'.format(version), 'burp-ui>={}'.format(version),
'ujson', 'ujson',
'redis', 'redis',
'Flask-Session==0.3.0' 'Flask-Session==0.3.1'
], ],
classifiers=[ classifiers=[
'Framework :: Flask', 'Framework :: Flask',
@ -52,7 +52,7 @@ setup(
'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: Linux',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.6',
'Topic :: System :: Archiving :: Backup', 'Topic :: System :: Archiving :: Backup',
'Topic :: System :: Monitoring', 'Topic :: System :: Monitoring',
] ]

2
pkgs/burp-ui-ldap/setup.py
View file

@ -50,7 +50,7 @@ setup(
'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: Linux',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.6',
'Topic :: System :: Archiving :: Backup', 'Topic :: System :: Archiving :: Backup',
'Topic :: System :: Monitoring', 'Topic :: System :: Monitoring',
] ]

2
pkgs/burp-ui-sql/setup.py
View file

@ -52,7 +52,7 @@ setup(
'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: Linux',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.6',
'Topic :: System :: Archiving :: Backup', 'Topic :: System :: Archiving :: Backup',
'Topic :: System :: Monitoring', 'Topic :: System :: Monitoring',
] ]

1
setup.py
View file

@ -312,7 +312,6 @@ setup(
'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: Linux',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
'Topic :: System :: Archiving :: Backup', 'Topic :: System :: Archiving :: Backup',
'Topic :: System :: Monitoring', 'Topic :: System :: Monitoring',