6 files changed, 120 insertions(+), 36 deletions(-)

M .github/workflows/test_nlp.yaml
M nlp/Makefile
M nlp/pyproject.toml
A nlp/requirements/dev-requirements.txt
A nlp/requirements/requirements.in
A nlp/requirements/requirements.txt

@@ 17,10 17,6 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Run image
-        uses: abatilo/actions-poetry@v2.0.0
-        with:
-          poetry-version: ${{ matrix.poetry-version }}
       - name: Install dependencies
         run: make -C nlp bootstrap
       - name: Test and calculate coverage

@@ 1,22 1,22 @@
 .DEFAULT_GOAL=help
 
-bootstrap: # Install dependencies via poetry
-	poetry install
-	poetry run python -m spacy download en_core_web_sm
+bootstrap: # Install dependencies
+	pip install -r requirements/requirements.txt
+	pip install -r requirements/dev-requirements.txt
+	python -m spacy download en_core_web_sm
 
 coverage: # Run unittests tests and calculate coverage
-	poetry run coverage run -m pytest tests
-	poetry run coverage report --skip-covered
-	poetry run mypy nlp
+	coverage run -m pytest tests
+	coverage report --skip-covered
 
 mypy: # Run mypy static analysis tests
-	poetry run mypy --ignore-missing-imports nlp
+	mypy --ignore-missing-imports nlp
 
 clean: # Clean up cache files
 	@find . -type f -name "*.py[co]" -delete
 	@find . -type d -name "__pycache__" -delete
 
 help: # Show this help
-	poetry run python -m nlp --help || true
+	python -m nlp --help || true
 	@echo
-	@egrep -h '\s#\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+	@grep -E -h '\s#\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'

@@ 1,25 1,3 @@
-[tool.poetry]
-name = "nlp"
-version = "0.1.0"
-description = ""
-authors = ["Logan Connolly <logan.connolly@protonmail.com>"]
-
-[tool.poetry.dependencies]
-python = "^3.10"
-spacy = "^3.2.1"
-requests = "^2.26.0"
-
-[tool.poetry.dev-dependencies]
-pytest = "^7.1.2"
-coverage = {extras = ["toml"], version = "^6.2"}
-mypy = "^0.971"
-types-requests = "^2.26.2"
-black = "^22.6.0"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
 [tool.black]
 target-version = ['py310']
 include = '\.pyi?$'


@@ 32,7 10,7 @@ multi_line_output = 3
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
-module = "aoc"
+module = "nlp"
 disallow_untyped_defs = true
 disallow_incomplete_defs = true
 

@@ 0,0 1,4 @@
+pytest
+coverage[toml]
+mypy
+types-requests

@@ 0,0 1,2 @@
+spacy
+requests

@@ 0,0 1,104 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --output-file=- -
+#
+annotated-types==0.5.0
+    # via pydantic
+blis==0.7.10
+    # via thinc
+catalogue==2.0.9
+    # via
+    #   spacy
+    #   srsly
+    #   thinc
+certifi==2023.7.22
+    # via requests
+charset-normalizer==3.2.0
+    # via requests
+click==8.1.6
+    # via typer
+confection==0.1.1
+    # via thinc
+cymem==2.0.7
+    # via
+    #   preshed
+    #   spacy
+    #   thinc
+idna==3.4
+    # via requests
+jinja2==3.1.2
+    # via spacy
+langcodes==3.3.0
+    # via spacy
+markupsafe==2.1.3
+    # via jinja2
+murmurhash==1.0.9
+    # via
+    #   preshed
+    #   spacy
+    #   thinc
+numpy==1.25.2
+    # via
+    #   blis
+    #   spacy
+    #   thinc
+packaging==23.1
+    # via
+    #   spacy
+    #   thinc
+pathy==0.10.2
+    # via spacy
+preshed==3.0.8
+    # via
+    #   spacy
+    #   thinc
+pydantic==2.1.1
+    # via
+    #   confection
+    #   spacy
+    #   thinc
+pydantic-core==2.4.0
+    # via pydantic
+requests==2.31.0
+    # via
+    #   -r -
+    #   spacy
+smart-open==6.3.0
+    # via
+    #   pathy
+    #   spacy
+spacy==3.6.1
+    # via -r -
+spacy-legacy==3.0.12
+    # via spacy
+spacy-loggers==1.0.4
+    # via spacy
+srsly==2.4.7
+    # via
+    #   confection
+    #   spacy
+    #   thinc
+thinc==8.1.11
+    # via spacy
+tqdm==4.65.1
+    # via spacy
+typer==0.9.0
+    # via
+    #   pathy
+    #   spacy
+typing-extensions==4.7.1
+    # via
+    #   pydantic
+    #   pydantic-core
+    #   typer
+urllib3==2.0.4
+    # via requests
+wasabi==1.1.2
+    # via
+    #   spacy
+    #   thinc
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools