From 9e0f2d825865cafb28ece644372a8af284d72dc1 Mon Sep 17 00:00:00 2001
From: Ben Randerson <ben.m.randerson@gmail.com>
Date: Thu, 14 Jun 2018 20:51:21 +0100
Subject: [PATCH] refined setup.py

---
 setup.py                | 40 +++++++---------------------------------
 tests/test_asmeb31_8.py |  0
 wallthick/asmeb31_8.py  |  7 +++++++
 3 files changed, 14 insertions(+), 33 deletions(-)
 create mode 100644 tests/test_asmeb31_8.py
 create mode 100644 wallthick/asmeb31_8.py

diff --git a/setup.py b/setup.py
index 0f1b3e5..d9c8d29 100644
--- a/setup.py
+++ b/setup.py
@@ -7,47 +7,23 @@
 
 import setuptools
 
-# Package meta-data.
-NAME = 'wallthick'
-DESCRIPTION = 'PD8010 wall thickness calculations.'
-URL = 'https://github.com/benranderson/wallthick'
-EMAIL = 'ben.m.randerson@gmail.com'
-AUTHOR = 'Ben Randerson'
-REQUIRES_PYTHON = '>=3.4.0'
-VERSION = None
-
-# What packages are required for this module to be executed?
-requirements = [
-    'click',
-    'scipy',
-]
-
-setup_requirements = ['pytest-runner', ]
-
-test_requirements = ['pytest', ]
-
-with open('README.md') as readme_file:
-    long_description = readme_file.read()
-
 
 setuptools.setup(
-    name=NAME,
+    name='wallthick',
     version=wallthick.__version__,
-    description=DESCRIPTION,
-    long_description=long_description,
+    long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
-    author=AUTHOR,
-    author_email=EMAIL,
-    python_requires=REQUIRES_PYTHON,
-    url=URL,
+    author='Ben Randerson',
+    author_email='ben.m.randerson@gmail.com',
+    python_requires='>=3.4.0',
+    url='https://github.com/benranderson/wallthick',
     packages=setuptools.find_packages(include=['wallthick']),
     entry_points={
         'console_scripts': [
             'wallthick=wallthick.cli:main',
         ],
     },
-    install_requires=requirements,
-    setup_requires=setup_requirements,
+    install_requires=open('requirements.txt').readlines(),
     include_package_data=True,
     license='MIT License',
     zip_safe=False,
@@ -59,6 +35,4 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
     ],
-    test_suite='tests',
-    tests_require=test_requirements,
 )
diff --git a/tests/test_asmeb31_8.py b/tests/test_asmeb31_8.py
new file mode 100644
index 0000000..e69de29
diff --git a/wallthick/asmeb31_8.py b/wallthick/asmeb31_8.py
new file mode 100644
index 0000000..fe63cd4
--- /dev/null
+++ b/wallthick/asmeb31_8.py
@@ -0,0 +1,7 @@
+"""
+ASME B31.8
+"""
+
+
+TITLE = "ASME B31.8"
+YEAR = 2016