diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35c3a42..b5eea28 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: with: python-version: '3.8' - name: Install dependencies - run: pip install -r requirements.txt -r dev-requirements.txt + run: pip install -r dev-requirements.txt - name: Setup git user run: | git config user.name "GitHub Actions" @@ -29,10 +29,10 @@ jobs: if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }} env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: coverage run -a ./update.py --release + run: coverage run -a ./scripts/update.py --release - name: Update if: ${{ !(github.ref == 'refs/heads/master' && github.event_name != 'pull_request') }} - run: coverage run -a ./update.py + run: coverage run -a ./scripts/update.py # FIXME #- name: Report coverage # env: diff --git a/Makefile b/Makefile index 3d3c6ed..a68b34d 100644 --- a/Makefile +++ b/Makefile @@ -13,3 +13,7 @@ lint: format: $(PYTHON) -m black -t py38 . + +.PHONY: test +test: + $(PYTHON) -m pytest diff --git a/dev-requirements.txt b/dev-requirements.txt index e62b715..ed3bb3e 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,10 @@ +# main +requests==2.28.1 +beautifulsoup4==4.11.1 +tqdm==4.64.1 +icalendar==4.1.0 + +# test pytest==7.2.0 coverage==6.5.0 black==22.10.0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index f0be95b..0000000 --- a/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -requests==2.28.1 -beautifulsoup4==4.11.1 -tqdm==4.64.1 -icalendar==4.1.0 \ No newline at end of file diff --git a/tests/description_parsing_cases.json b/scripts/description_parsing_cases.json similarity index 100% rename from tests/description_parsing_cases.json rename to scripts/description_parsing_cases.json diff --git a/fetch_holidays.py b/scripts/fetch.py old mode 100755 new mode 100644 similarity index 100% rename from fetch_holidays.py rename to scripts/fetch.py diff --git a/tests/test_fetch_holidays.py b/scripts/fetch_test.py similarity index 95% rename from tests/test_fetch_holidays.py rename to scripts/fetch_test.py index 3161b1f..fd2b660 100644 --- a/tests/test_fetch_holidays.py +++ b/scripts/fetch_test.py @@ -3,7 +3,7 @@ import json import pytest -from fetch_holidays import ( +from fetch import ( CustomJSONEncoder, DescriptionParser, get_paper, @@ -11,7 +11,7 @@ from fetch_holidays import ( get_rules, ) -from .filetools import _file_path +from filetools import _file_path def test_get_paper_urls(): diff --git a/tests/filetools.py b/scripts/filetools.py similarity index 100% rename from tests/filetools.py rename to scripts/filetools.py diff --git a/generate_ics.py b/scripts/generate_ics.py similarity index 100% rename from generate_ics.py rename to scripts/generate_ics.py diff --git a/update.py b/scripts/update.py old mode 100755 new mode 100644 similarity index 98% rename from update.py rename to scripts/update.py index b5e0bcc..7c7bbe0 --- a/update.py +++ b/scripts/update.py @@ -13,7 +13,7 @@ from zipfile import ZipFile from tqdm import tqdm -from fetch_holidays import CustomJSONEncoder, fetch_holiday +from fetch import CustomJSONEncoder, fetch_holiday from generate_ics import generate_ics diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000