7 files changed, 60 insertions, 53 deletions

diff --git a/Makefile b/Makefile
index 852f221..e9fb990 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-package: COPYING ngus/__init__.py ngus/__main__.py LICENSE README.md setup.py
-        python setup.py sdist bdist_wheel
+package: COPYING src/ngus/__init__.py src/ngus/__main__.py LICENSE README.md setup.py pyproject.toml setup.cfg
+        python -m build
 
 upload: dist/*
         python -m twine upload dist/*
@@ -8,4 +8,4 @@ upload-test: dist/*
         python -m twine upload --repository testpypi dist/* 
 
 clean:
-        rm -rf build dist ngus/__pycache__ ngus.egg-info
+        rm -rf dist src/ngus/__pycache__ src/ngus.egg-info
diff --git a/README.md b/README.md
index 67689ad..670720a 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ Simeon Simeonov - sgs @ LiberaChat
 
 ## [License](https://github.com/blackm0re/ngus/blob/master/LICENSE)
 
-Copyright (c) 2021, Simeon Simeonov
+Copyright (c) 2021-2023 Simeon Simeonov
 All rights reserved.
 
 [Licensed](https://github.com/blackm0re/ngus/blob/master/LICENSE) under the
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..73c35b2
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+    "setuptools>=51",
+    "wheel"
+]
+
+build-backend = "setuptools.build_meta"
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..795c715
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,41 @@
+[metadata]
+name = ngus
+version = attr: ngus.__version__
+author = attr: ngus.__author__
+author_email = sgs@pichove.org
+description = A simple HTTP server for handleing file uploads
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/blackm0re/ngus
+
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: End Users/Desktop
+    License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
+    Programming Language :: Python :: Implementation
+    Operating System :: OS Independent
+    Topic :: Internet :: WWW/HTTP :: HTTP Servers
+
+project_urls =
+    Bug Tracker = https://github.com/blackm0re/ngus/issues
+    Source = https://github.com/blackm0re/ngus
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.7
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
+console_scripts =
+    ngus = ngus.__main__:main
diff --git a/setup.py b/setup.py
index fbdefcb..a5d21d8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,46 +1,5 @@
-import setuptools
+# Legacy setup for some build / install systems
 
-import ngus
+from setuptools import setup
 
-with open('README.md', 'r') as fh:
-    long_description = fh.read()
-
-
-setuptools.setup(
-    name='ngus',
-    version=ngus.__version__,
-    author=ngus.__author__,
-    author_email='sgs@pichove.org',
-    description='A simple HTTP server for handleing file uploads',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/blackm0re/ngus',
-    packages=setuptools.find_packages(),
-    exclude_package_data={'': ['.gitignore']},
-    entry_points={
-        'console_scripts': [
-            'ngus=ngus.__main__:main',
-        ],
-    },
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: End Users/Desktop',
-        ('License :: OSI Approved :: GNU General Public License v3 or later '
-         '(GPLv3+)'),
-        'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: Implementation',
-        'Operating System :: OS Independent',
-        'Topic :: Internet :: WWW/HTTP :: HTTP Servers'
-    ],
-    keywords='upload http httpd',
-    project_urls={
-        'Bug Reports': 'https://github.com/blackm0re/ngus/issues',
-        'Source': 'https://github.com/blackm0re/ngus'
-    },
-    python_requires='>=3.6',
-)
+setup()
diff --git a/ngus/__init__.py b/src/ngus/__init__.py
index 2b2be7d..d085fc1 100644
--- a/ngus/__init__.py
+++ b/src/ngus/__init__.py
@@ -1,5 +1,5 @@
-# ngus v1.0
-# Copyright (C) 2021 Simeon Simeonov
+# ngus
+# Copyright (C) 2021-2023 Simeon Simeonov
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ import http.server
 import pathlib
 
 __author__ = 'Simeon Simeonov'
-__version__ = '1.0'
+__version__ = '2.0'
 __license__ = 'GPL3'
 
 DEFAULT_UPLOAD_PAGE = bytes('''<!DOCTYPE html>
diff --git a/ngus/__main__.py b/src/ngus/__main__.py
index 3d09dbf..efa2c4a 100644
--- a/ngus/__main__.py
+++ b/src/ngus/__main__.py
@@ -1,5 +1,5 @@
-# ngus v1.0
-# Copyright (C) 2021 Simeon Simeonov
+# ngus
+# Copyright (C) 2021-2023 Simeon Simeonov
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by