correct versions of dependencies
This commit is contained in:
Cayo Puigdefabregas
parent
83f1e4c18f
commit
e6f91db4e4
|
|
@ -3,7 +3,6 @@ atomicwrites==1.4.0
|
|||
click-spinner==0.1.8
|
||||
colorama==0.3.9
|
||||
colour==0.1.5
|
||||
ereuse-utils[naming,test,session,cli]==0.4.0b50
|
||||
Flask-Cors==3.0.10
|
||||
Flask-Login==0.5.0
|
||||
Flask-WTF==1.0.0
|
||||
|
|
@ -24,7 +23,6 @@ requests-toolbelt==0.9.1
|
|||
sortedcontainers==2.1.0
|
||||
sqlalchemy-citext==1.3.post0
|
||||
sqlalchemy-utils==0.33.11
|
||||
teal==0.2.0a38
|
||||
tqdm==4.32.2
|
||||
|
||||
# workbench json parsing dependencies
|
||||
|
|
@ -37,8 +35,19 @@ xlrd==2.0.1 # pandas dependency
|
|||
openpyxl==3.0.10 # pandas dependency
|
||||
et_xmlfile==1.1.0 # pandas dependency
|
||||
|
||||
# manual dependency
|
||||
marshmallow-enum==1.4.1
|
||||
|
||||
# flask_mail dependency
|
||||
blinker==1.5
|
||||
|
||||
# teal dependency
|
||||
anytree==2.8.0
|
||||
apispec==0.39.0
|
||||
# apispec-webframeworks==0.5.2
|
||||
boltons==23.0.0
|
||||
flask-sqlalchemy>=2.5.1
|
||||
marshmallow==3.0.0b11
|
||||
marshmallow-enum==1.4.1
|
||||
webargs==5.5.3
|
||||
Werkzeug>=2.0.3
|
||||
|
||||
# ereuse-utils dependency
|
||||
inflection==0.5.1
|
||||
|
|
@ -6,18 +6,16 @@
|
|||
#
|
||||
alembic==1.4.2
|
||||
# via -r requirements.in
|
||||
anytree==2.4.3
|
||||
# via teal
|
||||
anytree==2.8.0
|
||||
# via -r requirements.in
|
||||
apispec==0.39.0
|
||||
# via teal
|
||||
# via -r requirements.in
|
||||
atomicwrites==1.4.0
|
||||
# via -r requirements.in
|
||||
blinker==1.5
|
||||
# via -r requirements.in
|
||||
boltons==18.0.1
|
||||
# via
|
||||
# ereuse-utils
|
||||
# teal
|
||||
boltons==23.0.0
|
||||
# via -r requirements.in
|
||||
cairocffi==1.4.0
|
||||
# via
|
||||
# cairosvg
|
||||
|
|
@ -33,21 +31,13 @@ cffi==1.15.1
|
|||
charset-normalizer==2.0.12
|
||||
# via requests
|
||||
click==6.7
|
||||
# via
|
||||
# ereuse-utils
|
||||
# flask
|
||||
# via flask
|
||||
click-spinner==0.1.8
|
||||
# via
|
||||
# -r requirements.in
|
||||
# teal
|
||||
# via -r requirements.in
|
||||
colorama==0.3.9
|
||||
# via
|
||||
# -r requirements.in
|
||||
# ereuse-utils
|
||||
# via -r requirements.in
|
||||
colour==0.1.5
|
||||
# via
|
||||
# -r requirements.in
|
||||
# sqlalchemy-utils
|
||||
# via -r requirements.in
|
||||
cssselect2==0.7.0
|
||||
# via
|
||||
# cairosvg
|
||||
|
|
@ -56,31 +46,23 @@ defusedxml==0.7.1
|
|||
# via
|
||||
# cairosvg
|
||||
# odfpy
|
||||
ereuse-utils[cli,naming,session,test]==0.4.0b50
|
||||
# via
|
||||
# -r requirements.in
|
||||
# teal
|
||||
et-xmlfile==1.1.0
|
||||
# via
|
||||
# -r requirements.in
|
||||
# openpyxl
|
||||
flask==1.0.2
|
||||
# via
|
||||
# ereuse-utils
|
||||
# flask-cors
|
||||
# flask-login
|
||||
# flask-sqlalchemy
|
||||
# flask-weasyprint
|
||||
# flask-wtf
|
||||
# teal
|
||||
flask-cors==3.0.10
|
||||
# via
|
||||
# -r requirements.in
|
||||
# teal
|
||||
# via -r requirements.in
|
||||
flask-login==0.5.0
|
||||
# via -r requirements.in
|
||||
flask-sqlalchemy==2.5.1
|
||||
# via teal
|
||||
# via -r requirements.in
|
||||
flask-weasyprint==0.4
|
||||
# via -r requirements.in
|
||||
flask-wtf==1.0.0
|
||||
|
|
@ -91,8 +73,8 @@ html5lib==1.1
|
|||
# via weasyprint
|
||||
idna==3.4
|
||||
# via requests
|
||||
inflection==0.3.1
|
||||
# via ereuse-utils
|
||||
inflection==0.5.1
|
||||
# via -r requirements.in
|
||||
itsdangerous==2.0.1
|
||||
# via
|
||||
# flask
|
||||
|
|
@ -108,8 +90,8 @@ markupsafe==2.1.1
|
|||
# wtforms
|
||||
marshmallow==3.0.0b11
|
||||
# via
|
||||
# -r requirements.in
|
||||
# marshmallow-enum
|
||||
# teal
|
||||
# webargs
|
||||
marshmallow-enum==1.4.1
|
||||
# via -r requirements.in
|
||||
|
|
@ -126,13 +108,9 @@ openpyxl==3.0.10
|
|||
pandas==1.3.5
|
||||
# via -r requirements.in
|
||||
passlib==1.7.1
|
||||
# via
|
||||
# -r requirements.in
|
||||
# sqlalchemy-utils
|
||||
# via -r requirements.in
|
||||
phonenumbers==8.9.11
|
||||
# via
|
||||
# -r requirements.in
|
||||
# sqlalchemy-utils
|
||||
# via -r requirements.in
|
||||
pillow==9.2.0
|
||||
# via cairosvg
|
||||
pint==0.9
|
||||
|
|
@ -173,9 +151,7 @@ requests==2.27.1
|
|||
requests-mock==1.5.2
|
||||
# via -r requirements.in
|
||||
requests-toolbelt==0.9.1
|
||||
# via
|
||||
# -r requirements.in
|
||||
# ereuse-utils
|
||||
# via -r requirements.in
|
||||
six==1.16.0
|
||||
# via
|
||||
# anytree
|
||||
|
|
@ -194,11 +170,7 @@ sqlalchemy==1.3.24
|
|||
# sqlalchemy-utils
|
||||
sqlalchemy-citext==1.3.post0
|
||||
# via -r requirements.in
|
||||
sqlalchemy-utils[color,password,phone]==0.33.11
|
||||
# via
|
||||
# -r requirements.in
|
||||
# teal
|
||||
teal==0.2.0a38
|
||||
sqlalchemy-utils==0.33.11
|
||||
# via -r requirements.in
|
||||
tinycss2==1.1.1
|
||||
# via
|
||||
|
|
@ -206,22 +178,22 @@ tinycss2==1.1.1
|
|||
# cssselect2
|
||||
# weasyprint
|
||||
tqdm==4.32.2
|
||||
# via
|
||||
# -r requirements.in
|
||||
# ereuse-utils
|
||||
# via -r requirements.in
|
||||
urllib3==1.26.12
|
||||
# via requests
|
||||
weasyprint==44
|
||||
# via flask-weasyprint
|
||||
webargs==5.5.3
|
||||
# via teal
|
||||
# via -r requirements.in
|
||||
webencodings==0.5.1
|
||||
# via
|
||||
# cssselect2
|
||||
# html5lib
|
||||
# tinycss2
|
||||
werkzeug==2.0.3
|
||||
# via flask
|
||||
# via
|
||||
# -r requirements.in
|
||||
# flask
|
||||
wtforms==3.0.1
|
||||
# via flask-wtf
|
||||
xlrd==2.0.1
|
||||
|
|
|
|||
36
setup.py
36
setup.py
|
|
@ -1,12 +1,10 @@
|
|||
from pathlib import Path
|
||||
|
||||
from setuptools import find_packages, setup
|
||||
|
||||
from ereuse_devicehub import __version__
|
||||
|
||||
|
||||
test_requires = [
|
||||
'pytest',
|
||||
'requests_mock'
|
||||
]
|
||||
test_requires = ['pytest', 'requests_mock']
|
||||
|
||||
setup(
|
||||
name='ereuse-devicehub',
|
||||
|
|
@ -15,7 +13,7 @@ setup(
|
|||
project_urls={
|
||||
'Documentation': 'http://devicehub.ereuse.org',
|
||||
'Code': 'http://github.com/ereuse/devicehub-teal',
|
||||
'Issue tracker': 'https://tree.taiga.io/project/ereuseorg-devicehub/issues?q=rules'
|
||||
'Issue tracker': 'https://tree.taiga.io/project/ereuseorg-devicehub/issues?q=rules',
|
||||
},
|
||||
license='Affero',
|
||||
author='eReuse.org team',
|
||||
|
|
@ -26,10 +24,10 @@ setup(
|
|||
python_requires='>=3.7.3',
|
||||
long_description=Path('README.md').read_text('utf8'),
|
||||
install_requires=[
|
||||
'teal>=0.2.0a38', # teal always first
|
||||
# 'teal>=0.2.0a38', # teal always first
|
||||
'click',
|
||||
'click-spinner',
|
||||
'ereuse-utils[naming,test,session,cli]>=0.4b49',
|
||||
# 'ereuse-utils[naming,test,session,cli]>=0.4b49',
|
||||
'hashids',
|
||||
'marshmallow_enum',
|
||||
'psycopg2-binary',
|
||||
|
|
@ -40,29 +38,21 @@ setup(
|
|||
'sqlalchemy-citext',
|
||||
'sqlalchemy-utils[password, color, phone]',
|
||||
'Flask-WeasyPrint',
|
||||
'sortedcontainers'
|
||||
'sortedcontainers',
|
||||
],
|
||||
extras_require={
|
||||
'docs': [
|
||||
'sphinx',
|
||||
'sphinxcontrib-httpdomain >= 1.5.0',
|
||||
'sphinxcontrib-plantuml >= 0.12',
|
||||
'sphinxcontrib-websupport >= 1.0.1'
|
||||
'sphinxcontrib-websupport >= 1.0.1',
|
||||
],
|
||||
'docs-auto': [
|
||||
'sphinx-autobuild'
|
||||
],
|
||||
'test': test_requires
|
||||
'docs-auto': ['sphinx-autobuild'],
|
||||
'test': test_requires,
|
||||
},
|
||||
tests_require=test_requires,
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'dh = ereuse_devicehub.cli:cli'
|
||||
]
|
||||
},
|
||||
setup_requires=[
|
||||
'pytest-runner'
|
||||
],
|
||||
entry_points={'console_scripts': ['dh = ereuse_devicehub.cli:cli']},
|
||||
setup_requires=['pytest-runner'],
|
||||
classifiers=[
|
||||
'Development Status :: 2 - Pre-Alpha',
|
||||
'Environment :: Web Environment',
|
||||
|
|
@ -76,5 +66,5 @@ setup(
|
|||
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
|
||||
'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
|
||||
'Topic :: Software Development :: Libraries :: Python Modules',
|
||||
]
|
||||
],
|
||||
)
|
||||
|
|
|
|||
Reference in a new issue