Remove Poetry for dependency management

nationalarchives · Nov 29, 2023 · a9db082 · a9db082
1 parent 34d9aeb
commit a9db082
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 366 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,15 +13,13 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: '3.x'
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
       - name: Install Python requirements
-        run: poetry install
+        run: pip install -r requirements.txt
       - name: Lint Python
         run: |
-          poetry run isort . --diff --verbose
-          poetry run black . --check --verbose
-          poetry run flake8 . --verbose
+          isort . --diff --verbose
+          black . --check --verbose
+          flake8 . --verbose
 
   test:
     name: Test
@@ -33,15 +31,13 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: '3.x'
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
       - name: Get fixtures
         run: cd .. && git clone https://github.com/nationalarchives/tna-frontend.git
       - name: Install Python requirements
-        run: poetry install
+        run: pip install -r requirements.txt
       - name: Install Node dependencies
         run: cd tasks && npm install
       - name: Run server
-        run: poetry run flask --app tna-frontend-jinja run --debug --port 5000 &
+        run: flask --app tna-frontend-jinja run --debug --port 5000 &
       - name: Run the tests
         run: node ./tasks/test.mjs || exit 1
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -15,16 +15,14 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: '3.x'
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
       - name: Get fixtures
         run: cd .. && git clone https://github.com/nationalarchives/tna-frontend.git
       - name: Install Python requirements
-        run: poetry install
+        run: pip install -r requirements.txt
       - name: Install Node dependencies
         run: cd tasks && npm install
       - name: Run server
-        run: poetry run flask --app tna-frontend-jinja run --debug --port 5000 &
+        run: flask --app tna-frontend-jinja run --debug --port 5000 &
       - name: Run the tests
         run: node ./tasks/test.mjs || exit 1
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.2...HEAD)
+## [Unreleased](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.3...HEAD)
 
 ### Added
 ### Changed
@@ -14,6 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## [0.1.3](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.2...v0.1.3) - 2023-11-29
+
+### Changed
+
+- Change package name back to `tna-frontend-jinja`
+- Remove Poetry for dependency management
+
 ## [0.1.2](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.1...v0.1.2) - 2023-11-29
 
 ### Changed

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,5 @@
+black==23.3.0
+django==4.2.2
+flake8==6.0.0
+flask==2.3.2
+isort==5.12.0
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,15 @@
+[metadata]
+# This includes the license file(s) in the wheel.
+# https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file
+license_files = LICENSE
+
+[flake8]
+exclude=venv
+ignore=E203,W503
+max-complexity=10
+max-line-length=120
+
+[isort]
+profile=black
+multi_line_output=3
+line_length=120
diff --git a/setup.py b/setup.py
@@ -0,0 +1,34 @@
+import setuptools
+
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name="tna-frontend-jinja",
+    version="0.1.3",
+    author="Andrew Hosgood",
+    author_email="[email protected]",
+    description="The National Archives frontend Jinja templates",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/nationalarchives/tna-frontend-jinja",
+    project_urls={
+        "Bug Tracker": "https://github.com/nationalarchives/tna-frontend-jinja/issues",
+    },
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Environment :: Web Environment",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Code Generators",
+        "Topic :: Software Development :: User Interfaces",
+        "Topic :: Text Processing :: Markup :: HTML",
+    ],
+    packages=setuptools.find_packages(exclude=["app"]),
+    package_data={
+        "templates": ["*.html"],
+    },
+    python_requires=">=3.8",
+    install_requires=["flask>=2"],
+)