Merge pull request #11 from stephenhky/optimized_machinecodes

Fortran 90 codes refactoring

.circleci/config.yml

@@ -21,7 +21,6 @@ shared: &shared
           pip install --upgrade --user pandas
           pip install --upgrade --user Cython
           pip install --upgrade --user .
-          pip install --upgrade --user unittest2
 
     - run:
         name: Run Unit Tests

README.md

@@ -24,6 +24,7 @@ After ensuring they have been installed, type the following to install `graphflo
 
 # News
 
+* 04/19/2021: `graphflow` 0.4.1 released.
 * 04/10/2021: `graphflow` 0.4.0 released.
 * 04/09/2020: `graphflow` 0.3.0 released.
 * 04/07/2020: `graphflow` 0.2.1 released.

doc/source/conf.py

@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.3'
+version = u'0.4'
 # The full version, including alpha/beta/rc tags.
-release = u'0.3.0'
+release = u'0.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/news.rst

@@ -1,6 +1,7 @@
 News
 ====
 
+* 04/19/2021: `graphflow` 0.4.1 released.
 * 04/10/2021: `graphflow` 0.4.0 released.
 * 04/09/2020: `graphflow` 0.3.0 released.
 * 04/07/2020: `graphflow` 0.2.1 released.
@@ -15,7 +16,18 @@ News
 What's New
 ----------
 
-Release 0.3.0 (April 9, 2020)
+Release 0.4.1 (April 19, 2021)
+------------------------------
+
+* Refactoring Fortran 90 implementation imports.
+
+Release 0.4.0 (April 10, 2021)
+------------------------------
+
+* Replacing TravisCI with CircleCI in continuous integration (CI) pipeline;
+* Huge refactoring.
+
+Release 0.3.0 (April 09, 2020)
 -----------------------------
 
 * Support for Python 3.8;

graphflow/pagerank/GooglePageRank.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from f90pagerank import f90pagerank as fpr
+from .f90pagerank import f90pagerank as fpr
 from .cpagerank import pagerank_cython
 from .. import L1norm, PageRankLanguage
 

setup.py

@@ -18,7 +18,7 @@
 from numpy.distutils.core import setup
 from numpy.distutils.core import Extension as fortranExtension
 
-fortran_ext_modules = [fortranExtension('f90pagerank',
+fortran_ext_modules = [fortranExtension('graphflow.pagerank.f90pagerank',
                                          sources=['graphflow/pagerank/f90pagerank.f90',
                                                   'graphflow/pagerank/f90pagerank.pyf'])]
 
@@ -33,7 +33,7 @@ def install_requirements():
 
 
 setup(name='graphflow',
-      version="0.4.0",
+      version="0.4.1",
       description="Algorithms for Graph Flow Analysis",
       long_description="Numerical routines for analyzing data represented by graphs",
       classifiers=[
@@ -65,7 +65,7 @@ def install_requirements():
       setup_requires=['numpy', 'Cython'],
       install_requires=install_requirements(),
       tests_require=[
-          'unittest2', 'pandas',
+          'pandas',
       ],
       include_dirs=[np.get_include()],
       ext_modules=fortran_ext_modules+dynprog_ext_modules,