Merge pull request #96 from brandonwillard/update-unification-dependency

Update dependencies and use versioneer

Author: brandonwillard

.gitattributes

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

.pylintrc

@@ -263,7 +263,7 @@ ignore-mixin-members=yes
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=tensorflow.core.framework,tensorflow.python.framework,tensorflow.python.ops.gen_linalg_ops
+ignored-modules=tensorflow.core.framework,tensorflow.python.framework,tensorflow.python.ops.gen_linalg_ops,tensorflow.python.eager.context,tensorflow.compat.v1
 
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set). This supports can work

.travis.yml

@@ -1,27 +1,23 @@
 dist: xenial
 language: python
 
-matrix:
-  include:
-  - name: "Python 3.6 Lint"
-    python: 3.6
-    env: PYTHON_VERSION=3.6 NAME="LINT"
-  - name: "Python 3.6 Unit Test"
-    python: 3.6
-    env: PYTHON_VERSION=3.6 NAME="UNIT"
+python:
+  - "3.6"
+  - "3.7"
+  # No tf-nightly for this version
+  # - "3.8"
+  # Cython and/or Numpy fails with permission errors
+  # - "pypy3"
 
 install:
   - pip install -r requirements.txt
-  - pip install -r requirements-dev.txt
-  - if [[ $NAME == UNIT ]]; then pip install coveralls; fi
-  - pip freeze
 
 script:
-  - if [[ $NAME == UNIT ]]; then pytest -v tests/ --cov=symbolic_pymc/; fi
-  - if [[ $NAME == LINT ]]; then make lint; fi
+  - pylint symbolic_pymc/ tests/
+  - if [[ `command -v black` ]]; then
+      black --check symbolic_pymc tests;
+    fi
+  - pytest -v tests/ --cov=symbolic_pymc/
 
 after_success:
-  - echo $(pwd)
-  - ls -la
-  - if [[ $NAME == UNIT ]]; then sed -i 's/\/opt\/symbolic-pymc/\/home\/travis\/build\/pymc-devs\/symbolic-pymc/g' .coverage; fi
-  - if [[ $NAME == UNIT ]]; then coveralls; fi
+  - coveralls

MANIFEST.in

@@ -0,0 +1,2 @@
+include versioneer.py
+include symbolic_pymc/_version.py

Makefile

@@ -51,11 +51,11 @@ format:
 
 style:
 	@printf "Checking code style with pylint...\n"
-	pylint symbolic_pymc/
+	pylint symbolic_pymc/ tests/
 	@printf "\033[1;34mPylint passes!\033[0m\n\n"
 
 black:  # Format code in-place using black.
-	black symbolic_pymc/
+	black symbolic_pymc/ tests/
 
 test:  # Test code using pytest.
 	pytest -v tests/ --cov=symbolic_pymc/ --cov-report=xml --html=testing-report.html --self-contained-html

requirements-dev.txt

@@ -1,14 +1,11 @@
-scipy>=1.2.0
-Theano>=1.0.4
-pymc4 @ git+https://github.com/pymc-devs/pymc4.git@master#egg=pymc4-0.0.1
-tfp-nightly==0.9.0.dev20191003
-tf-nightly-2.0-preview==2.0.0.dev20191002
-tensorflow-estimator-2.0-preview>=1.14.0.dev2019090801
-pymc3>=3.6
-multipledispatch>=0.6.0
-logical-unification>=0.2.2
-kanren @ git+https://github.com/pymc-devs/kanren.git@symbolic-pymc#egg=kanren-0.2.3
-cons>=0.1.3
-toolz>=0.9.0
-sympy>=1.3
-cachetools
+-e ./
+coveralls
+pydocstyle>=3.0.0
+pytest>=5.0.0
+pytest-cov>=2.6.1
+pytest-html>=1.20.0
+pylint>=2.3.1
+black>=19.3b0; platform.python_implementation!='PyPy'
+diff-cover
+ipython
+versioneer

requirements.txt

@@ -1,3 +1,11 @@
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = symbolic_pymc/_version.py
+versionfile_build = symbolic_pymc/_version.py
+tag_prefix = v
+parentdir_prefix = symbolic-pymc-
+
 [pydocstyle]
 # Ignore errors for missing docstrings.
 # Ignore D202 (No blank lines allowed after function docstring)
@@ -11,6 +19,11 @@ filterwarnings =
     ignore:the imp module is deprecated:DeprecationWarning:
     ignore:Using a non-tuple sequence:FutureWarning:theano\.tensor
 
+[coverage:run]
+omit =
+    symbolic_pymc/_version.py
+    tests/*
+
 [coverage:report]
 exclude_lines =
     pragma: no cover

setup.cfg

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import codecs
-import re
+import versioneer
+
 from pathlib import Path
 
 from setuptools import setup, find_packages
@@ -11,47 +11,60 @@
 README_FILE = PROJECT_ROOT / "README.md"
 VERSION_FILE = PROJECT_ROOT / "symbolic_pymc" / "__init__.py"
 
-NAME = "Symbolic PyMC"
-DESCRIPTION = "Symbolic mathematics for PyMC"
+NAME = "symbolic-pymc"
+DESCRIPTION = "Tools for symbolic math in PyMC"
 AUTHOR = "PyMC Developers"
 AUTHOR_EMAIL = "pymc.devs@gmail.com"
 URL = ("https://github.com/pymc-devs/symbolic-pymc",)
 
 
-def get_requirements():
-    with codecs.open(REQUIREMENTS_FILE) as buff:
-        return buff.read().splitlines()
-
-
 def get_long_description():
-    with codecs.open(README_FILE, "rt") as buff:
+    with open(README_FILE, "rt") as buff:
         return buff.read()
 
 
-def get_version():
-    lines = open(VERSION_FILE, "rt").readlines()
-    version_regex = r"^__version__ = ['\"]([^'\"]*)['\"]"
-    for line in lines:
-        mo = re.search(version_regex, line, re.M)
-        if mo:
-            return mo.group(1)
-    raise RuntimeError("Unable to find version in %s." % (VERSION_FILE,))
-
-
-if __name__ == "__main__":
-    setup(
-        name=NAME,
-        version=get_version(),
-        description=DESCRIPTION,
-        author=AUTHOR,
-        author_email=AUTHOR_EMAIL,
-        url=URL,
-        install_requires=get_requirements(),
-        packages=find_packages(exclude=['tests']),
-        tests_require=[
-            'pytest'
-        ],
-        long_description=get_long_description(),
-        long_description_content_type="text/markdown",
-        include_package_data=True,
-    )
+setup(
+    name=NAME,
+    version=versioneer.get_version(),
+    cmdclass=versioneer.get_cmdclass(),
+    description=DESCRIPTION,
+    author=AUTHOR,
+    author_email=AUTHOR_EMAIL,
+    url=URL,
+    install_requires=[
+        "scipy>=1.2.0",
+        "Theano>=1.0.4",
+        "tf-nightly-2.0-preview==2.0.0.dev20191002",
+        "tf-nightly==2.1.0.dev20191003",
+        "tensorflow-estimator-2.0-preview>=1.14.0.dev2019090801",
+        "tfp-nightly==0.9.0.dev20191003",
+        "multipledispatch>=0.6.0",
+        "logical-unification>=0.2.2",
+        "miniKanren>=0.2.5",
+        "cons>=0.1.3",
+        "toolz>=0.9.0",
+        "sympy>=1.3",
+        "cachetools",
+        "pymc3>=3.6",
+        "pymc4 @ git+https://github.com/pymc-devs/pymc4.git@master#egg=pymc4-0.0.1",
+    ],
+    packages=find_packages(exclude=["tests"]),
+    tests_require=["pytest"],
+    long_description=get_long_description(),
+    long_description_content_type="text/markdown",
+    include_package_data=True,
+    python_requires=">=3.6",
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Science/Research",
+        "Intended Audience :: Developers",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "Topic :: Software Development :: Libraries",
+    ],
+)

setup.py

@@ -1,4 +1,7 @@
 # We need this so that `multipledispatch` initialization occurs
 from .unify import *
 
-__version__ = "0.0.1"
+from ._version import get_versions
+
+__version__ = get_versions()["version"]
+del get_versions