diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8d176e9..3114dfa 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,10 +2,13 @@ version: 2 updates: - package-ecosystem: pip directory: "/" + exclude-paths: + - "requirements-dev.txt" + - "setup.py" schedule: interval: weekly time: "01:30" - open-pull-requests-limit: 10 + open-pull-requests-limit: 5 target-branch: dev assignees: - "ahreccese" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7715ae..c5d3b35 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,10 +36,9 @@ jobs: run: | python -m pip install --upgrade pip pip install . - - name: Install dev-requirements + - 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 run: | python -m pytest tests/ --cov=ipforce --cov-report=term --ignore=tests/test_ipv4.py --ignore=tests/test_ipv6.py diff --git a/CHANGELOG.md b/CHANGELOG.md index b5de6b8..df88d37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Logo ### Changed - `README.md` updated +- Dependencies structure modified ## [0.1] - 2026-02-16 ### Added - `IPv6TransportAdapter` class diff --git a/dev-requirements.txt b/requirements-dev.txt similarity index 84% rename from dev-requirements.txt rename to requirements-dev.txt index c448343..0b02ecd 100644 --- a/dev-requirements.txt +++ b/requirements-dev.txt @@ -1,4 +1,3 @@ -requests==2.32.5 setuptools>=40.8.0 vulture>=1.0 bandit>=1.5.1 diff --git a/requirements-latest.txt b/requirements-latest.txt new file mode 100644 index 0000000..727711c --- /dev/null +++ b/requirements-latest.txt @@ -0,0 +1 @@ +requests==2.32.5 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 1480256..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -requests>=2.20.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 1068fb3..d5a289c 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,6 @@ # -*- coding: utf-8 -*- """Setup module.""" -from typing import List -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - - -def get_requires() -> List[str]: - """Read requirements.txt.""" - requirements = open("requirements.txt", "r").read() - return list(filter(lambda x: x != "", requirements.split())) - +from setuptools import setup def read_description() -> str: """Read README.md and CHANGELOG.md.""" @@ -41,11 +30,11 @@ def read_description() -> str: author_email='ipforce@openscilab.com', url='https://github.com/openscilab/ipforce', download_url='https://github.com/openscilab/ipforce/tarball/v0.1', - keywords="http ipv4 ipv6 network requests adapter dns socket protocol ip-force", + keywords='http ipv4 ipv6 network requests adapter dns socket protocol ip-force', project_urls={ 'Source': 'https://github.com/openscilab/ipforce' }, - install_requires=get_requires(), + install_requires=['requests>=2.20.0'], python_requires='>=3.7', classifiers=[ 'Development Status :: 2 - Pre-Alpha',