diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 79967b7..0a1415c 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: - "sepandhaghighi" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 11a8e72..885f86a 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: 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 run: | python -m pytest . --cov=rokh --cov-report=term diff --git a/CHANGELOG.md b/CHANGELOG.md index 1975359..fe37d31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- Dependencies structure modified ## [0.4] - 2026-04-29 ### Added - Bahesab calendar events diff --git a/dev-requirements.txt b/requirements-dev.txt similarity index 73% rename from dev-requirements.txt rename to requirements-dev.txt index 696d541..be8ba00 100644 --- a/dev-requirements.txt +++ b/requirements-dev.txt @@ -1,5 +1,3 @@ -jdatetime==5.2.0 -hijridate==2.5.0 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..0692254 --- /dev/null +++ b/requirements-latest.txt @@ -0,0 +1,2 @@ +jdatetime==5.2.0 +hijridate==2.5.0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index bccc865..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -jdatetime>=3.8.2 -hijridate>=2.3.0 diff --git a/setup.py b/setup.py index 79054cb..2fd7365 100644 --- a/setup.py +++ b/setup.py @@ -1,16 +1,6 @@ # -*- coding: utf-8 -*- """Setup module.""" -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - - -def get_requires() -> list: - """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.""" @@ -40,11 +30,14 @@ def read_description() -> str: author_email='rokh@openscilab.com', url='https://github.com/openscilab/rokh', download_url='https://github.com/openscilab/rokh/tarball/v0.4', - keywords="events date date-system calendar gregorian hijri jalali", + keywords='events date date-system calendar gregorian hijri jalali', project_urls={ - 'Source': 'https://github.com/openscilab/rokh', + 'Source': 'https://github.com/openscilab/rokh', }, - install_requires=get_requires(), + install_requires=[ + 'jdatetime>=3.8.2', + 'hijridate>=2.3.0' + ], python_requires='>=3.7', classifiers=[ 'Development Status :: 3 - Alpha',