New setup tools

jhavl · jhavl · commit b0359f203c61 · 2020-09-07T14:38:41.000+10:00
diff --git a/.github/dev_requirements.txt b/.github/dev_requirements.txt
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -6,8 +6,6 @@ name: build
 on:
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   unittest:
@@ -26,16 +24,9 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r .github/dev_requirements.txt
-#     - name: Lint with flake8
-#       run: |
-#         # stop the build if there are Python syntax errors or undefined names
-#         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-#         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-#         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-        pip install .
+        pip install .[dev]
         pytest
   codecov:
     # If all tests pass:
@@ -51,10 +42,9 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r .github/dev_requirements.txt
     - name: Run coverage
       run: |
-        pip install -e .
+        pip install -e .[dev]
         pytest --cov=roboticstoolbox --cov-report xml:coverage.xml
         coverage report
     - name: upload coverage to Codecov
@@ -75,8 +65,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r .github/dev_requirements.txt
-        pip install .
+        pip install .[docs]
     - name: Build docs
       run: |
         cd docs
diff --git a/setup.py b/setup.py
@@ -4,6 +4,26 @@
 
 here = path.abspath(path.dirname(__file__))
 
+req = [
+    'numpy',
+    'spatialmath-python>=0.7.1',
+    'scipy',
+    'matplotlib'
+]
+
+dev_req = [
+    'pytest',
+    'pytest-cov',
+    'flake8',
+    'pyyaml',
+]
+
+docs_req = [
+    'sphinx',
+    'sphinx_rtd_theme',
+    'sphinx_markdown_tables'
+]
+
 # Get the long description from the README file
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
@@ -15,7 +35,7 @@
 
 def package_files(directory):
     paths = []
-    for (pathhere, directories, filenames) in os.walk(directory):
+    for (pathhere, _, filenames) in os.walk(directory):
         for filename in filenames:
             paths.append(os.path.join('..', pathhere, filename))
     return paths
@@ -59,9 +79,10 @@ def package_files(directory):
 
     include_package_data=True,
 
-    install_requires=[
-        'numpy',
-        'spatialmath-python>=0.7.1',
-        'scipy',
-        'matplotlib']
+    install_requires=req,
+
+    extras_require={
+        'dev': dev_req,
+        'docs': docs_req,
+    }
 )
