diff --git a/configure b/configure index cbceeca..54faba7 100755 --- a/configure +++ b/configure @@ -29,7 +29,7 @@ CLI_ARGS=$1 # Requirement arguments passed to pip and used by default or with --dev. REQUIREMENTS="--editable . --requirement requirements.txt" -DEV_REQUIREMENTS="--editable .[testing] --requirement requirements.txt --requirement requirements-dev.txt" +DEV_REQUIREMENTS="--editable .[dev] --requirement requirements.txt --requirement requirements-dev.txt" DOCS_REQUIREMENTS="--editable .[docs] --requirement requirements.txt" # where we create a virtualenv diff --git a/configure.bat b/configure.bat index 99f88c8..5d36e0f 100644 --- a/configure.bat +++ b/configure.bat @@ -27,7 +27,7 @@ @rem # Requirement arguments passed to pip and used by default or with --dev. set "REQUIREMENTS=--editable . --requirement requirements.txt" -set "DEV_REQUIREMENTS=--editable .[testing] --requirement requirements.txt --requirement requirements-dev.txt" +set "DEV_REQUIREMENTS=--editable .[dev] --requirement requirements.txt --requirement requirements-dev.txt" set "DOCS_REQUIREMENTS=--editable .[docs] --requirement requirements.txt" @rem # where we create a virtualenv diff --git a/pyproject-aboutcode.federatedcode.toml b/pyproject-aboutcode.federatedcode.toml index 3d70bad..f35c818 100644 --- a/pyproject-aboutcode.federatedcode.toml +++ b/pyproject-aboutcode.federatedcode.toml @@ -38,7 +38,7 @@ dependencies = [ "aboutcode.hashid>=0.2.0", "click>=8.1.7", "Django>=5.1.2", - "packageurl_python >= 0.15.6", + "packageurl_python >= 0.16.0", "python-dotenv>=1.0.1", "requests>=2.32.3", "saneyaml>=0.6.0", diff --git a/requirements-dev.txt b/requirements-dev.txt index dfc52a0..3065346 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,23 +1,41 @@ -aboutcode-toolkit==10.1.0 -black==23.7.0 -execnet==2.0.2 -isort==5.12.0 -pytest==7.3.2 -pytest-django==4.5.2 -pytest-xdist==3.5.0 -python-dateutil==2.8.2 -Sphinx==7.2.6 -sphinx-autobuild==2021.3.14 -sphinx-copybutton==0.5.2 -sphinx-reredirects==0.1.3 -sphinx-rtd-dark-mode==1.3.0 -sphinx-rtd-theme==2.0.0 -sphinxcontrib-applehelp==1.0.7 -sphinxcontrib-devhelp==1.0.5 -sphinxcontrib-htmlhelp==2.0.4 -sphinxcontrib-jquery==4.1 -sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.6 -sphinxcontrib-serializinghtml==1.1.9 -sphinxcontrib_django -sphinx-jsonschema \ No newline at end of file +snowballstemmer==2.2.0 +platformdirs==4.3.6 +django-debug-toolbar==4.2.0 +stevedore==5.4.0 +pyflakes==3.2.0 +zipp==3.21.0 +jeepney==0.8.0 +flake8==7.1.1 +Pygments==2.18.0 +mdurl==0.1.2 +black==24.10.0 +pydocstyle==6.3.0 +jaraco.context==6.0.1 +SecretStorage==3.3.3 +pycodestyle==2.12.1 +more-itertools==10.5.0 +pathspec==0.12.1 +importlib_metadata==8.5.0 +twine==6.0.1 +docutils==0.21.2 +readme_renderer==44.0 +rich==13.9.4 +keyring==25.5.0 +nh3==0.2.19 +pbr==6.1.0 +flot==0.7.2 +jaraco.functools==4.1.0 +doc8==1.1.2 +requests-toolbelt==1.0.0 +rfc3986==2.0.0 +backports.tarfile==1.2.0 +restructuredtext-lint==1.4.0 +mccabe==0.7.0 +isort==5.13.2 +bandit==1.8.0 +pytest-xdist==3.6.1 +pkginfo==1.12.0 +markdown-it-py==3.0.0 +jaraco.classes==3.4.0 +mypy-extensions==1.0.0 +execnet==2.1.1 diff --git a/requirements.txt b/requirements.txt index ff27931..28cd1cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,93 +1,83 @@ -aboutcode.pipeline==0.1.0 -aboutcode-toolkit==10.1.0 -alabaster==0.7.13 -anyio==4.1.0 -asgiref==3.7.2 -attrs==23.1.0 -Babel==2.14.0 -boolean.py==4.0 -certifi==2023.5.7 -cffi==1.15.1 -charset-normalizer==3.1.0 +aboutcode.hashid==0.2.0 +aboutcode.pipeline==0.2.0 +alabaster==1.0.0 +annotated-types==0.7.0 +anyio==4.7.0 +asgiref==3.8.1 +attrs==24.2.0 +babel==2.16.0 +certifi==2024.8.30 +cffi==1.17.1 +charset-normalizer==3.4.0 click==8.1.7 colorama==0.4.6 -cryptography==41.0.1 -dateparser==1.1.8 -Deprecated==1.2.14 -Django==5.0.1 +cryptography==44.0.0 +Django==5.1.2 django-environ==0.11.2 -django-oauth-toolkit==2.3.0 -django-rest-framework==0.1.0 -djangorestframework==3.14.0 -django-ninja==1.2.1 -docutils==0.20.1 -et-xmlfile==1.1.0 -exceptiongroup==1.1.1 -execnet==2.0.2 -gitdb==4.0.10 -GitPython==3.1.40 -gunicorn==21.2.0 +django-ninja==1.3.0 +django-oauth-toolkit==3.0.1 +djangorestframework==3.15.2 +doc8==1.1.2 +docutils==0.21.2 +exceptiongroup==1.2.2 +gitdb==4.0.11 +GitPython==3.1.43 +gunicorn==23.0.0 h11==0.14.0 -http-message-signatures==0.4.4 -http-sfv==0.9.8 -httpcore==0.17.3 -httpx==0.25.1 -idna==3.4 +http-message-signatures==0.5.0 +http_sfv==0.9.9 +httpcore==1.0.7 +httpx==0.28.1 +idna==3.10 imagesize==1.4.1 -importlib-metadata==7.0.1 iniconfig==2.0.0 -isort==5.12.0 -jaraco.classes==3.3.0 -jeepney==0.8.0 -Jinja2==3.1.2 -jwcrypto==1.5.0 -keyring==24.3.0 -license-expression==30.2.0 -livereload==2.6.3 -markdown-it-py==3.0.0 -MarkupSafe==2.1.3 -mdurl==0.1.2 -more-itertools==10.1.0 -mypy-extensions==1.0.0 -nh3==0.2.15 +Jinja2==3.1.4 +jsonpointer==3.0.0 +jwcrypto==1.5.6 +MarkupSafe==3.0.2 oauthlib==3.2.2 -openpyxl==3.1.2 -packageurl-python==0.15.6 -packaging==23.1 -pathspec==0.11.2 -Pillow==9.5.0 -pkginfo==1.9.6 -platformdirs==3.10.0 -pluggy==1.0.0 -psycopg==3.1.16 -psycopg-binary==3.1.16 -psycopg2-binary==2.9.9 -pycodestyle==2.11.1 -pycparser==2.21 -Pygments==2.17.2 -python-dateutil==2.8.2 -pydantic==2.8.2 -pytz==2023.3 -PyYAML==6.0.1 -readme-renderer==42.0 -regex==2023.8.8 -requests==2.31.0 -requests-toolbelt==1.0.0 -rfc3986==2.0.0 -rich==13.7.0 -saneyaml==0.6.0 -SecretStorage==3.3.3 -six==1.16.0 -smmap==5.0.0 -sniffio==1.3.0 +packageurl-python==0.16.0 +packaging==24.2 +pbr==6.1.0 +pillow==11.0.0 +pluggy==1.5.0 +pprintpp==0.4.0 +psycopg2-binary==2.9.10 +pycparser==2.22 +pydantic==2.10.3 +pydantic_core==2.27.1 +Pygments==2.18.0 +pytest==8.3.4 +pytest-django==4.9.0 +python-dotenv==1.0.1 +PyYAML==6.0.2 +requests==2.32.3 +restructuredtext-lint==1.4.0 +saneyaml==0.6.1 +smmap==5.0.1 +sniffio==1.3.1 snowballstemmer==2.2.0 -sqlparse==0.4.4 -tomli==2.0.1 -tornado==6.4 -twine==4.0.2 -typing_extensions==4.6.3 -tzlocal==5.0.1 -unidiff==0.7.5 -urllib3==2.0.3 -wrapt==1.15.0 -zipp==3.17.0 +Sphinx==8.1.3 +sphinx-autobuild==2024.10.3 +sphinx-copybutton==0.5.2 +sphinx-jsonschema==1.19.1 +sphinx-rtd-dark-mode==1.3.0 +sphinx-rtd-theme==3.0.2 +sphinx_reredirects==0.1.5 +sphinxcontrib-applehelp==2.0.0 +sphinxcontrib-devhelp==2.0.0 +sphinxcontrib-django==2.5 +sphinxcontrib-htmlhelp==2.1.0 +sphinxcontrib-jquery==4.1 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==2.0.0 +sphinxcontrib-serializinghtml==2.0.0 +sqlparse==0.5.3 +starlette==0.41.3 +stevedore==5.4.0 +tomli==2.2.1 +typing_extensions==4.12.2 +urllib3==2.2.3 +uvicorn==0.32.1 +watchfiles==1.0.3 +websockets==14.1 diff --git a/setup.cfg b/setup.cfg index ea2bebe..529e75c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,82 +44,40 @@ include_package_data = true zip_safe = false install_requires = - Django>=4.2.6 - psycopg2-binary>=2.8.6 - djangorestframework>=3.12.4 - django-oauth-toolkit>=2.3.0 - django-rest-framework>=0.1.0 - djangorestframework>=3.14.0 - django-environ>=0.10.0 - gunicorn>=21.2.0 - GitPython>=3.1.31 - requests>=2.31.0 - saneyaml>=0.6.0 - # - httpx>=0.24.1 - http-message-signatures>=0.4.4 - - anyio>=4.1.0 - asgiref>=3.7.2 - attrs>=23.1.0 - certifi>=2023.5.7 - cffi>=1.15.1 - charset-normalizer>=3.1.0 - click>=8.1.7 - cryptography>=41.0.1 - dateparser>=1.1.8 - Deprecated>=1.2.14 - exceptiongroup>=1.1.1 - gitdb>=4.0.10 - h11>=0.14.0 - http-sfv>=0.9.8 - httpcore>=0.17.3 - idna>=3.4 - iniconfig>=2.0.0 - isort>=5.12.0 - jwcrypto>=1.5.0 - mypy-extensions>=1.0.0 - oauthlib>=3.2.2 - packageurl-python>=0.15.6 - packaging>=23.1 - pathspec>=0.11.2 - - #?? - Pillow>=9.5.0 - - platformdirs>=3.10.0 - pluggy>=1.0.0 - pycparser>=2.21 - pytest>=7.3.2 - pytest-django>=4.5.2 - python-dateutil>=2.8.2 - pytz>=2023.3 - regex>=2023.8.8 - saneyaml>=0.6.0 - six>=1.16.0 - smmap>=5.0.0 - sniffio>=1.3.0 - sqlparse>=0.4.4 - tomli>=2.0.1 - typing_extensions>=4.6.3 - tzlocal>=5.0.1 - unidiff>=0.7.5 - urllib3>=2.0.3 - wrapt>=1.15.0 + Django==5.1.2 + django-oauth-toolkit==3.0.1 + djangorestframework==3.15.2 + django-environ==0.11.2 + gunicorn==23.0.0 + GitPython==3.1.43 + requests==2.32.3 + httpx==0.28.1 + http-message-signatures==0.5.0 + attrs==24.2.0 + # Django ImageField + pillow==11.0.0 + cryptography==44.0.0 + idna==3.10 + packageurl-python==0.16.0 + psycopg2-binary==2.9.10 + pytest==8.3.4 + pytest-django==4.9.0 + saneyaml==0.6.1 # Schema - django-ninja>=1.2.1 - pydantic>=2.8.2 + django-ninja==1.3.0 + pydantic==2.10.3 # Pipeline - aboutcode.pipeline>=0.1.0 + aboutcode.pipeline==0.2.0 # aboutcode.federatedcode.client - aboutcode.hashid>=0.1.0 - python-dotenv>=1.0.1 + aboutcode.hashid==0.2.0 + python-dotenv==1.0.1 + click==8.1.7 [options.extras_require] -testing = +dev = # Validation flake8>=6.1.0 black>=23.0.0 @@ -130,8 +88,8 @@ testing = bandit>=1.7.5 pytest >= 6, != 7.0.0 pytest-xdist >= 2 - aboutcode-toolkit >= 7.0.2 - twine + twine>=6.0.1 + flot>=0.7.2 # Debug django-debug-toolbar==4.2.0