From 8579c8e985c58c2dce2d3ba7d7713c90be4b4184 Mon Sep 17 00:00:00 2001 From: Cullen Watson Date: Sun, 3 Sep 2023 12:05:50 -0500 Subject: [PATCH] proj structure --- jobspy/tests/__init__.py | 0 pyproject.toml | 11 ++++++----- {jobspy => src/jobspy}/__init__.py | 15 ++++++--------- {jobspy => src/jobspy}/core/__init__.py | 0 {jobspy/core => src/jobspy}/jobs/__init__.py | 0 {jobspy/core => src/jobspy}/scrapers/__init__.py | 0 .../jobspy}/scrapers/indeed/__init__.py | 0 .../jobspy}/scrapers/linkedin/__init__.py | 0 .../jobspy}/scrapers/ziprecruiter/__init__.py | 0 {jobspy/tests => tests}/test_indeed.py | 3 +-- {jobspy/tests => tests}/test_ziprecruiter.py | 4 ++-- 11 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 jobspy/tests/__init__.py rename {jobspy => src/jobspy}/__init__.py (91%) rename {jobspy => src/jobspy}/core/__init__.py (100%) rename {jobspy/core => src/jobspy}/jobs/__init__.py (100%) rename {jobspy/core => src/jobspy}/scrapers/__init__.py (100%) rename {jobspy/core => src/jobspy}/scrapers/indeed/__init__.py (100%) rename {jobspy/core => src/jobspy}/scrapers/linkedin/__init__.py (100%) rename {jobspy/core => src/jobspy}/scrapers/ziprecruiter/__init__.py (100%) rename {jobspy/tests => tests}/test_indeed.py (81%) rename {jobspy/tests => tests}/test_ziprecruiter.py (67%) diff --git a/jobspy/tests/__init__.py b/jobspy/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pyproject.toml b/pyproject.toml index f1768e2..597e14c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,14 @@ [tool.poetry] name = "python-jobspy" -version = "0.1.0" +version = "1.0.0" description = "Job scraper for LinkedIn, Indeed & ZipRecruiter" authors = ["Zachary Hampton ", "Cullen Watson "] readme = "README.md" +packages = [ + { include = "jobspy", from = "src" } +] + [tool.poetry.dependencies] python = "^3.10" requests = "^2.31.0" @@ -20,7 +24,4 @@ jupyter = "^1.0.0" [build-system] requires = ["poetry-core"] -build-backend = "poetry.core.masonry.api" - -[[tool.poetry.packages]] -include = "jobspy/**/*" \ No newline at end of file +build-backend = "poetry.core.masonry.api" \ No newline at end of file diff --git a/jobspy/__init__.py b/src/jobspy/__init__.py similarity index 91% rename from jobspy/__init__.py rename to src/jobspy/__init__.py index b88ec93..f3bb15f 100644 --- a/jobspy/__init__.py +++ b/src/jobspy/__init__.py @@ -1,17 +1,14 @@ import pandas as pd -from typing import List, Dict, Tuple, Union +from typing import List, Tuple -from concurrent.futures import ThreadPoolExecutor - -from .core.jobs import JobType -from .core.scrapers.indeed import IndeedScraper -from .core.scrapers.ziprecruiter import ZipRecruiterScraper -from .core.scrapers.linkedin import LinkedInScraper -from .core.scrapers import ( +from .jobs import JobType +from .scrapers.indeed import IndeedScraper +from .scrapers.ziprecruiter import ZipRecruiterScraper +from .scrapers.linkedin import LinkedInScraper +from .scrapers import ( ScraperInput, Site, JobResponse, - CommonResponse, ) diff --git a/jobspy/core/__init__.py b/src/jobspy/core/__init__.py similarity index 100% rename from jobspy/core/__init__.py rename to src/jobspy/core/__init__.py diff --git a/jobspy/core/jobs/__init__.py b/src/jobspy/jobs/__init__.py similarity index 100% rename from jobspy/core/jobs/__init__.py rename to src/jobspy/jobs/__init__.py diff --git a/jobspy/core/scrapers/__init__.py b/src/jobspy/scrapers/__init__.py similarity index 100% rename from jobspy/core/scrapers/__init__.py rename to src/jobspy/scrapers/__init__.py diff --git a/jobspy/core/scrapers/indeed/__init__.py b/src/jobspy/scrapers/indeed/__init__.py similarity index 100% rename from jobspy/core/scrapers/indeed/__init__.py rename to src/jobspy/scrapers/indeed/__init__.py diff --git a/jobspy/core/scrapers/linkedin/__init__.py b/src/jobspy/scrapers/linkedin/__init__.py similarity index 100% rename from jobspy/core/scrapers/linkedin/__init__.py rename to src/jobspy/scrapers/linkedin/__init__.py diff --git a/jobspy/core/scrapers/ziprecruiter/__init__.py b/src/jobspy/scrapers/ziprecruiter/__init__.py similarity index 100% rename from jobspy/core/scrapers/ziprecruiter/__init__.py rename to src/jobspy/scrapers/ziprecruiter/__init__.py diff --git a/jobspy/tests/test_indeed.py b/tests/test_indeed.py similarity index 81% rename from jobspy/tests/test_indeed.py rename to tests/test_indeed.py index 3ab2651..6f5104d 100644 --- a/jobspy/tests/test_indeed.py +++ b/tests/test_indeed.py @@ -1,4 +1,4 @@ -from jobspy import scrape_jobs +from src.jobspy import scrape_jobs def test_indeed(): @@ -6,5 +6,4 @@ def test_indeed(): site_name="indeed", search_term="software engineer", ) - assert result is not None diff --git a/jobspy/tests/test_ziprecruiter.py b/tests/test_ziprecruiter.py similarity index 67% rename from jobspy/tests/test_ziprecruiter.py rename to tests/test_ziprecruiter.py index 5320690..3d1d6b9 100644 --- a/jobspy/tests/test_ziprecruiter.py +++ b/tests/test_ziprecruiter.py @@ -1,4 +1,4 @@ -from jobspy import scrape_jobs +from src.jobspy import scrape_jobs def test_ziprecruiter(): @@ -7,4 +7,4 @@ def test_ziprecruiter(): search_term="software engineer", ) - assert result is not None \ No newline at end of file + assert result is not None