revert re-org of requirements

Makefile

@@ -1,21 +1,8 @@
 init::
-	python -m pip install --upgrade pip
 	python -m pip install pip-tools
-	python -m piptools compile task/requirements/dev-requirements.in
-	python -m piptools compile task/requirements/requirements.in
-	python -m piptools sync task/requirements/dev-requirements.txt task/requirements/requirements.txt
+	python -m piptools sync task/dev-requirements.txt
 	python -m pre_commit install
-
-reqs::
-	python -m piptools compile task/requirements/dev-requirements.in
-	python -m piptools compile task/requirements/requirements.in
-	python -m piptools sync task/requirements/requirements.txt task/requirements/dev-requirements.txt
-
-
-upgrade::
-	python -m piptools compile --upgrade task/requirements/dev-requirements.in
-	python -m piptools compile --upgrade task/requirements/requirements.in
-	python -m piptools sync task/requirements/requirements.txt task/requirements/dev-requirements.txt
+	python -m pip install -r task/requirements.txt
 
 test:: test-integration
 

task/dev-requirements.in

@@ -0,0 +1,12 @@
+-c requirements.txt
+pytest
+flake8
+pre-commit
+playwright
+pytest-playwright
+black>=22.3.0
+pytest-pudb
+SQLAlchemy-Utils
+pytest-mock
+pytest-md-report
+psycopg2

task/dev-requirements.txt

@@ -0,0 +1,158 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --output-file=task/dev-requirements.txt task/dev-requirements.in
+#
+attrs==22.2.0
+    # via pytest
+black==23.3.0
+    # via -r task/dev-requirements.in
+certifi==2022.12.7
+    # via requests
+cfgv==3.3.1
+    # via pre-commit
+chardet==5.1.0
+    # via mbstrdecoder
+charset-normalizer==3.1.0
+    # via requests
+click==8.0.3
+    # via
+    #   -c task/requirements.txt
+    #   black
+dataproperty==0.55.0
+    # via
+    #   pytablewriter
+    #   tabledata
+distlib==0.3.6
+    # via virtualenv
+filelock==3.10.7
+    # via virtualenv
+flake8==6.0.0
+    # via -r task/dev-requirements.in
+greenlet==2.0.1
+    # via playwright
+identify==2.5.22
+    # via pre-commit
+idna==3.4
+    # via requests
+iniconfig==2.0.0
+    # via pytest
+jedi==0.18.2
+    # via pudb
+mbstrdecoder==1.1.2
+    # via
+    #   dataproperty
+    #   pytablewriter
+    #   typepy
+mccabe==0.7.0
+    # via flake8
+mypy-extensions==1.0.0
+    # via black
+nodeenv==1.7.0
+    # via pre-commit
+packaging==23.0
+    # via
+    #   black
+    #   pudb
+    #   pytest
+    #   typepy
+parso==0.8.3
+    # via jedi
+pathspec==0.11.1
+    # via black
+pathvalidate==2.5.2
+    # via pytablewriter
+platformdirs==3.2.0
+    # via
+    #   black
+    #   virtualenv
+playwright==1.32.1
+    # via
+    #   -r task/dev-requirements.in
+    #   pytest-playwright
+pluggy==1.0.0
+    # via pytest
+pre-commit==3.2.1
+    # via -r task/dev-requirements.in
+psycopg2==2.9.6
+    # via -r task/dev-requirements.in
+pudb==2022.1.3
+    # via pytest-pudb
+pycodestyle==2.10.0
+    # via flake8
+pyee==9.0.4
+    # via playwright
+pyflakes==3.0.1
+    # via flake8
+pygments==2.14.0
+    # via pudb
+pytablewriter==0.64.2
+    # via pytest-md-report
+pytest==7.2.2
+    # via
+    #   -r task/dev-requirements.in
+    #   pytest-base-url
+    #   pytest-md-report
+    #   pytest-mock
+    #   pytest-playwright
+    #   pytest-pudb
+pytest-base-url==2.0.0
+    # via pytest-playwright
+pytest-md-report==0.3.0
+    # via -r task/dev-requirements.in
+pytest-mock==3.10.0
+    # via -r task/dev-requirements.in
+pytest-playwright==0.3.2
+    # via -r task/dev-requirements.in
+pytest-pudb==0.7.0
+    # via -r task/dev-requirements.in
+python-dateutil==2.8.2
+    # via typepy
+python-slugify==6.1.2
+    # via pytest-playwright
+pytz==2023.3
+    # via typepy
+pyyaml==6.0
+    # via pre-commit
+requests==2.28.2
+    # via
+    #   -c task/requirements.txt
+    #   pytest-base-url
+six==1.16.0
+    # via python-dateutil
+sqlalchemy==2.0.8
+    # via sqlalchemy-utils
+sqlalchemy-utils==0.40.0
+    # via -r task/dev-requirements.in
+tabledata==1.3.1
+    # via pytablewriter
+tcolorpy==0.1.2
+    # via
+    #   pytablewriter
+    #   pytest-md-report
+text-unidecode==1.3
+    # via python-slugify
+typepy[datetime]==1.3.0
+    # via
+    #   dataproperty
+    #   pytablewriter
+    #   pytest-md-report
+    #   tabledata
+typing-extensions==4.5.0
+    # via
+    #   pyee
+    #   sqlalchemy
+urllib3==1.26.15
+    # via requests
+urwid==2.1.2
+    # via
+    #   pudb
+    #   urwid-readline
+urwid-readline==0.13
+    # via pudb
+virtualenv==20.21.0
+    # via pre-commit
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

task/requirements.txt

@@ -1 +1,4 @@
--r requirements/requirements.txt
+-e git+https://github.com/digital-land/pipeline.git#egg=digital-land
+click==8.0.3
+psycopg2-binary==2.9.3
+requests