improve overall setup

sgratzl · Nov 14, 2019 · 0453251 · 0453251
1 parent 7acfb4e
commit 0453251
Show file tree

Hide file tree

Showing 19 changed files with 224 additions and 382 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,15 +10,8 @@ insert_final_newline = true
 charset = utf-8
 end_of_line = lf
 
-[*.bat]
-indent_style = tab
-end_of_line = crlf
-
 [LICENSE]
 insert_final_newline = false
 
-[Makefile]
-indent_style = tab
-
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -13,9 +13,7 @@ jobs:
         python-version: 3.7
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -r requirements_dev.txt
-    - name: make
+        pipenv install
+    - name: tox
       run: |
-        make install lint test coverage docs
+        tox
diff --git a/AUTHORS.rst b/AUTHORS.rst
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
diff --git a/Dockerfile b/Dockerfile
@@ -9,9 +9,7 @@ CMD ["python", "-i", "-c", "\"from slack_cleaner2 import *\""]
 RUN apk add --update bash && rm -rf /var/cache/apk/*
 # for better layers
 ADD ./requirements* /data/
-RUN pip --no-cache-dir install -r /data/requirements.txt && \
-    pip --no-cache-dir install -r /data/requirements_dev.txt && \
-    pip --no-cache-dir install -r /data/requirements_extra.txt
+RUN pip --no-cache-dir install -r /data/requirements.txt
 
 ADD . /data
 RUN pip --no-cache-dir install /data
diff --git a/HISTORY.rst b/HISTORY.rst
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018, Samuel Gratzl
+Copyright (c) 2019, Samuel Gratzl
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,11 +1,9 @@
-include AUTHORS.rst
 include CONTRIBUTING.rst
-include HISTORY.rst
 include LICENSE
-include README.rst
+include README.md
 
 recursive-include tests *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 
-recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
+recursive-include docs *.rst conf.py *.jpg *.png *.gif
diff --git a/Makefile b/Makefile
diff --git a/Pipfile b/Pipfile
@@ -4,6 +4,7 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+invoke = "*"
 mypy = ">=0.740"
 bumpversion = ">=0.5.3"
 watchdog = ">=0.9.0"

diff --git a/README.rst b/README.rst
diff --git a/docs/conf.py b/docs/conf.py
@@ -32,10 +32,12 @@
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
-autodoc_default_flags = ['members', 'inherited-members', 'show-inheritance']
-autoclass_content = 'both'
-autodoc_member_order = 'bysource'
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.viewcode',
+'sphinxcontrib.napoleon',
+
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -51,7 +53,7 @@
 
 # General information about the project.
 project = u'slack_cleaner2'
-copyright = u"2018, Samuel Gratzl"
+copyright = u"2019, Samuel Gratzl"
 author = u"Samuel Gratzl"
 
 # The version info for the project you're documenting, acts as replacement

diff --git a/docs/index.rst b/docs/index.rst
@@ -9,9 +9,6 @@ Welcome to slack_cleaner2's documentation!
    installation
    usage
    modules
-   contributing
-   authors
-   history
 
 Indices and tables
 ==================