Revert "Switch to Poetry, and update test data with some rounded values to try and help comparisons (#102)" (#103)

This reverts commit 33aaaa3.

Author: jrm5100

.gitattributes

@@ -0,0 +1 @@
+clarite/_version.py export-subst

.github/workflows/ci.yml

@@ -41,33 +41,29 @@ jobs:
         with:
           python-version: 3.7
 
-      - name: Install Poetry
-          uses: snok/[email protected]
+      - name: Upgrade pip
+        run: |
+          python -m pip install --upgrade pip
+          echo "PIP_CACHE_DIR=$(python -m pip cache dir)" >> $GITHUB_ENV
 
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
+      - name: Cache python dependencies
+        uses: actions/cache@v2
+        id: cache-python
         with:
-          path: ~/.virtualenvs
-          key: poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            poetry-${{ hashFiles('**/poetry.lock') }}
-
-      - name: Set Poetry config
-        run: |
-          poetry config virtualenvs.in-project false
-          poetry config virtualenvs.path ~/.virtualenvs
+          path: ${{ env.PIP_CACHE_DIR }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements/requirements.txt', 'requirements/requirements-dev.txt') }}
 
-      - name: Install Dependencies
+      - name: Install Dependencies (uses the cache when requirements did not change)
         run: |
-          poetry install
-        if: steps.cache.outputs.cache-hit != 'true'
+          python -m pip install -r requirements/requirements.txt
+          python -m pip install -r requirements/requirements-dev.txt
+          python -m pip install --upgrade twine wheel
 
       - name: Code Quality
-        run: poetry run black . --check
+        run: python -m black . --check
 
       - name: Test with pytest
-        run: poetry run pytest -n 2 --cov . --cov-report=xml
+        run: python -m pytest -n 2 --cov . --cov-report=xml  --cov-config=.coveragerc
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1

.readthedocs.yml

@@ -1,12 +1,19 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
 version: 2
 
+# Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/source/conf.py
 
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
 python:
   version: 3.7
   install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - docs
+    - requirements: requirements/requirements-rtd.txt

MANIFEST.in

@@ -0,0 +1,17 @@
+include AUTHORS.rst
+include CONTRIBUTING.rst
+include LICENSE
+include README.rst
+include requirements/*
+include clarite/modules/analyze/regression/r_code/*.R
+
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+
+recursive-include docs *.rst conf.py Makefile make.bat
+
+include versioneer.py
+include clarite/_version.py
+
+# If including data files in the package, add them like:
+# include path/to/data_file

clarite/__init__.py

@@ -1,10 +1,7 @@
-try:
-    import importlib.metadata as importlib_metadata
-except ModuleNotFoundError:
-    import importlib_metadata
+# flake8: noqa
+from ._version import get_versions
 
 from .modules import modify, plot, describe, analyze, load, survey
 
-__version__ = importlib_metadata.version(__name__)
-
-__all__ = ["__version__", "modify", "plot", "describe", "analyze", "load", "survey"]
+__version__ = get_versions()["version"]
+del get_versions