Dev (#10)

* Add short description to setup.py * switch to readthedocs * maybe fixing images * update readme * revise package structure, make Travis work again, bump version
JoshKarpel · Feb 28, 2019 · 6d67254 · 6d67254
1 parent 132b254
commit 6d67254
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 8 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -4,4 +4,4 @@ build:
 python:
     version: 3.6
 
-requirements_file: requirements_for_docs.txt
+requirements_file: requirements-docs.txt
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,17 @@
+dist: xenial
+
 language: python
 python:
   - "3.6"
+  - "3.7"
+
 install:
-  - pip install -r requirements.txt
+  - pip install --upgrade -r requirements-tests.txt
   - pip install -e .
-  - pip install pytest pytest-mock pytest-cov hypothesis
   - pip install codecov
+
 script:
   - pytest --cov
+
 after_success:
   - codecov
diff --git a/docs/source/_static/figs/quickstart_error.png b/docs/source/_static/figs/quickstart_error.png
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -3,13 +3,17 @@ Change Log
 
 .. currentmodule:: idesolver
 
+v1.0.3
+------
+* Revision of package structure and CI flow. There shouldn't be any impact on users.
+
 v1.0.2
 ------
 * IDESolver now explicitly requires Python 3.6+ on install. Dependencies on ``numpy`` and ``scipy`` are given as lower bounds.
 
 v1.0.1
 ------
-* Changed the name of ``IDESolver.F`` to ``f``.
+* Changed the name of ``IDESolver.F`` to ``f``, as intended.
 * The default global error function is now injected instead of hard-coded.
 
 v1.0.0

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -22,7 +22,7 @@
 
 import sphinx_rtd_theme
 
-sys.path.insert(0, os.path.abspath('../../src'))
+sys.path.insert(0, os.path.abspath('../../'))
 
 # -- General configuration ------------------------------------------------
 

diff --git a/src/idesolver/__init__.py → idesolver/__init__.py b/src/idesolver/__init__.py → idesolver/__init__.py
diff --git a/src/idesolver/idesolver.py → idesolver/idesolver.py b/src/idesolver/idesolver.py → idesolver/idesolver.py
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -0,0 +1,4 @@
+-r requirements.txt
+sphinx
+sphinx_rtd_theme
+sphinx_autodoc_typehints
diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -0,0 +1,6 @@
+-r requirements.txt
+pytest
+pytest-xdist
+pytest-mock
+pytest-cov
+hypothesis
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name = 'idesolver',
-    version = '1.0.2',
+    version = '1.0.3',
     author = 'Josh Karpel',
     author_email = 'karpel@wisc.edu',
     maintainer = 'Josh Karpel',
@@ -34,8 +34,7 @@
         'Topic :: Scientific/Engineering :: Mathematics',
         'Intended Audience :: Science/Research',
     ],
-    packages = find_packages('src'),
-    package_dir = {'': 'src'},
+    packages = find_packages(),
     install_requires = [
         'numpy>=1.13.0',
         'scipy>=1.0.0',