diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 633c63e..5a58d75 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,6 +2,9 @@ version: 2 updates: - package-ecosystem: pip directory: "/" + exclude-paths: + - "requirements-dev.txt" + - "setup.py" schedule: interval: weekly time: "01:30" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f343fc..0d63e37 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,10 +48,9 @@ jobs: run: | python -m reserver --token "${{ secrets.TEST_PYPI_PASSWORD }}" --test --name numpy reserver --token "${{ secrets.TEST_PYPI_PASSWORD }}" --test --name numpy - - name: Test requirements Installation + - name: Dev requirements Installation run: | - python otherfiles/requirements-splitter.py - pip install --upgrade --upgrade-strategy=only-if-needed -r test-requirements.txt + pip install --upgrade --upgrade-strategy=only-if-needed -r requirements-dev.txt - name: Test with pytest env: TWINE_TEST_USERNAME: ${{ secrets.TEST_PYPI_USERNAME }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bd6044..be39d08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - CodeQL (SAST) scan - Dependency Review (SCA) scan +### Changed +- Dependencies structure modified ## [0.8] - 2026-05-27 ### Changed - `upload` method in `uploader.py` diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index 8a2fc26..0000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -art==6.5 -setuptools==82.0.1 -wheel==0.46.3 -twine==6.2.0 -build==1.4.3 -vulture>=1.0 -bandit>=1.5.1 -pydocstyle>=6.3.0 -pytest>=4.3.1 -pytest-cov>=2.6.1 -chardet==5.2.0 \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..185f46f --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,5 @@ +vulture>=1.0 +bandit>=1.5.1 +pydocstyle>=6.3.0 +pytest>=4.3.1 +pytest-cov>=2.6.1 diff --git a/requirements-latest.txt b/requirements-latest.txt new file mode 100644 index 0000000..508a3a6 --- /dev/null +++ b/requirements-latest.txt @@ -0,0 +1,6 @@ +art==6.5 +setuptools==82.0.1 +wheel==0.46.3 +twine==6.2.0 +build==1.4.3 +chardet==5.2.0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index a741eab..0000000 --- a/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -art>=5.3 -setuptools>=40.8.0 -wheel>=0.35.0 -twine>=3.5.0 -chardet>=4.0.0 -build>=0.9.0 diff --git a/setup.py b/setup.py index 8483441..a60c4c9 100644 --- a/setup.py +++ b/setup.py @@ -1,16 +1,7 @@ # -*- coding: utf-8 -*- """Setup module.""" -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - - -def get_requires(): - """Read requirements.txt.""" - requirements = open("requirements.txt", "r").read() - return list(filter(lambda x: x != "", requirements.split())) +from setuptools import setup def read_description(): """Read README.md and CHANGELOG.md.""" @@ -37,11 +28,18 @@ def read_description(): author_email='reserver@openscilab.com', url='https://github.com/openscilab/reserver', download_url='https://github.com/openscilab/reserver/tarball/v0.8', - keywords="pypi pip package name reserve reserver reservation python", + keywords='pypi pip package name reserve reserver reservation python', project_urls={ - 'Source': 'https://github.com/openscilab/reserver', + 'Source': 'https://github.com/openscilab/reserver', }, - install_requires=get_requires(), + install_requires=[ + 'art>=5.3', + 'setuptools>=40.8.0', + 'wheel>=0.35.0', + 'twine>=3.5.0', + 'chardet>=4.0.0', + 'build>=0.9.0' + ], python_requires='>=3.7', classifiers=[ 'Development Status :: 3 - Alpha',