added FPM support

added VSCode config file.
updates to CI.
moved tests folder out of src

Author: jacobwilliams

.github/workflows/CI.yml

@@ -9,26 +9,36 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         gcc_v: [9] # Version of GFortran we want to use.
+        python-version: [3.7]
     env:
       FC: gfortran-${{ matrix.gcc_v }}
       GCC_V: ${{ matrix.gcc_v }}
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
 
     - name: Set up Python 3.x
       uses: actions/setup-python@v1 # Use pip to install latest CMake, & FORD/Jin2For, etc.
       with:
-        python-version: 3.x
+        python-version: ${{ matrix.python-version }}
+
+    - name: Setup Graphviz
+      uses: ts-graphviz/setup-graphviz@v1
 
-    - name: Install other tools
+    - name: Setup Fortran Package Manager
+      uses: fortran-lang/setup-fpm@v3
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Install Python dependencies
       if: contains( matrix.os, 'ubuntu')
       run: |
-        sudo apt-get install graphviz
-        sudo -H pip install numpy
-        sudo -H pip install ford && ford --version
-        sudo -H pip install matplotlib
+        python -m pip install --upgrade pip
+        pip install numpy matplotlib ford
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
     - name: Install GFortran Linux
       if: contains( matrix.os, 'ubuntu')
@@ -41,9 +51,7 @@ jobs:
         --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V}
 
     - name: Compile
-      run: |
-        mkdir bin
-        gfortran -O2 ./src/pyplot_module.f90 ./src/tests/test.f90 -o ./bin/test
+      run: fpm build --profile release
 
     - name: Run test
       run: ./bin/test
@@ -52,7 +60,7 @@ jobs:
       run: ford ./pyplot-fortran.md
 
     - name: Deploy Documentation
-      if: github.ref == 'refs/heads/master' 
+      if: github.ref == 'refs/heads/master'
       uses: JamesIves/github-pages-deploy-action@4.1.0
       with:
         branch: gh-pages # The branch the action should deploy to.

.gitignore

@@ -1,6 +1,7 @@
 bin/
 lib/
 doc/
+build/
 
 # Compiled Object files
 *.slo

README.md

@@ -1,20 +1,18 @@
-Pyplot-Fortran
-=============================
+### Pyplot-Fortran
+
 
 A simple module for generating plots from Fortran using Python's matplotlib.pyplot.
 
-Overview
----------------
+### Overview
 
 Currently, this module can be used to generate simple plots from Fortran.  Eventually, it may be expanded to provide additional features and other types of plots.
 
 The way it works is simply to generate a Python script with the plotting code, which
 is then executed from the command line using the Fortran ```execute_command_line``` function.
 
-The module requires a modern Fortran compiler (it uses various Fortran 2003/2008 features such as deferred-length strings). It should work fine with the latest gfortran or ifort compilers.  A simple script ```build.sh``` is provided for building the library and test program (requires gfortran and [FoBiS](https://github.com/szaghi/FoBiS)).  It will also build the HTML documentation if [FORD](https://github.com/cmacmackin/ford) is installed.
+The module requires a modern Fortran compiler (it uses various Fortran 2003/2008 features such as deferred-length strings). It should work fine with the latest gfortran or ifort compilers.  A simple script ```build.sh``` is provided for building the library and test program (requires gfortran and [FoBiS](https://github.com/szaghi/FoBiS)).  It will also build the HTML documentation if [FORD](https://github.com/Fortran-FOSS-Programmers/ford) is installed. A `fpm.toml` file is also provided for use with the [Fortran Package Manager](https://github.com/fortran-lang/fpm).
 
-Supported plot types
----------------
+### Supported plot types
 
 * ```matplotlib.pyplot.plot``` -- 2D/3D plot of lines and/or markers
 * ```matplotlib.pyplot.bar``` -- bar plot
@@ -24,42 +22,39 @@ Supported plot types
 * ```matplotlib.pyplot.hist``` -- histogram plot
 * ```matplotlib.pyplot.errorbar``` -- errorbar plot
 
-Example
----------------
+### Example
 
 The following example generates a plot of the sine function:
 
 ```Fortran
-    program test
-
-    use,intrinsic :: iso_fortran_env, only: wp => real64
-    use pyplot_module
+ program test
 
-    implicit none
+ use,intrinsic :: iso_fortran_env, only: wp => real64
+ use pyplot_module
 
-    real(wp),dimension(100) :: x,sx
-    type(pyplot) :: plt
-    integer :: i
+ implicit none
 
-    !generate some data:
-    x = [(real(i,wp), i=0,size(x)-1)]/5.0_wp
-    sx = sin(x)
+ real(wp),dimension(100) :: x,sx
+ type(pyplot) :: plt
+ integer :: i
 
-    !plot it:
-    call plt%initialize(grid=.true.,xlabel='angle (rad)',&
-                        title='Plot of $\sin(x)$',legend=.true.)
-    call plt%add_plot(x,sx,label='$\sin(x)$',linestyle='b-o',markersize=5,linewidth=2)
-    call plt%savefig('sinx.png', pyfile='sinx.py')
+ !generate some data:
+ x = [(real(i,wp), i=0,size(x)-1)]/5.0_wp
+ sx = sin(x)
 
-    end program test
+ !plot it:
+ call plt%initialize(grid=.true.,xlabel='angle (rad)',&
+                     title='Plot of $\sin(x)$',legend=.true.)
+ call plt%add_plot(x,sx,label='$\sin(x)$',linestyle='b-o',markersize=5,linewidth=2)
+ call plt%savefig('sinx.png', pyfile='sinx.py')
 
+ end program test
 ```
 
-Documentation
----------------
+### Documentation
+
+ * The API documentation for the current ```master``` branch can be found [here](https://jacobwilliams.github.io/pyplot-fortran/).  This is generated by processing the source files with [FORD](https://github.com/Fortran-FOSS-Programmers/ford).  Note that the build script will also generate these files automatically in the ```doc``` folder, assuming you have FORD installed.
 
- * The API documentation for the current ```master``` branch can be found [here](http://jacobwilliams.github.io/pyplot-fortran/).  This is generated by processing the source files with [FORD](https://github.com/cmacmackin/ford).  Note that the build script will also generate these files automatically in the ```doc``` folder, assuming you have FORD installed.
+### See also
 
-See also
----------------
- * [Matplotlib](http://matplotlib.org)
+ * [Matplotlib](https://matplotlib.org)

fpm.toml

@@ -0,0 +1,24 @@
+name = "pyplot-fortran"
+version = "3.1.0"
+author = "Jacob Williams"
+maintainer = "Jacob Williams"
+copyright = "Copyright (c) 2015-2021, Jacob Williams"
+license = "BSD-3"
+description = "A simple module for generating plots from Fortran using Python's matplotlib.pyplot."
+homepage = "https://github.com/jacobwilliams/pyplot-fortran"
+
+[library]
+source-dir = "src"
+
+[install]
+library = true
+
+[build]
+auto-executables = false
+auto-examples = false
+auto-tests = false
+
+[[test]]
+name = "test"
+source-dir = "tests"
+main = "test.f90"

pyplot-fortran.code-workspace

@@ -0,0 +1,13 @@
+{
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "files.trimTrailingWhitespace": true,
+        "editor.insertSpaces": true,
+        "editor.tabSize": 4,
+        "editor.trimAutoWhitespace": true
+    }
+}

pyplot.fobis

@@ -21,7 +21,7 @@ cflags_heritage = True
 build_dir       = ./lib/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False
@@ -38,7 +38,7 @@ cflags_heritage = True
 build_dir       = ./lib/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False
@@ -55,7 +55,7 @@ cflags_heritage = True
 build_dir       = ./lib/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False
@@ -72,7 +72,7 @@ cflags_heritage = True
 build_dir       = ./lib/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False
@@ -90,7 +90,7 @@ cflags_heritage = True
 build_dir       = ./bin/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False
@@ -104,7 +104,7 @@ cflags_heritage = True
 build_dir       = ./bin/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False
@@ -118,7 +118,7 @@ cflags_heritage = True
 build_dir       = ./bin/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False
@@ -132,7 +132,7 @@ cflags_heritage = True
 build_dir       = ./bin/
 mod_dir         = ./mod/
 obj_dir         = ./obj/
-src             = ./src/
+src             = ./
 colors          = True
 quiet           = False
 log             = False

src/pyplot_module.f90

@@ -243,7 +243,7 @@ subroutine initialize(me, grid, xlabel, ylabel, zlabel, title, legend, use_numpy
     call me%add_str('matplotlib.rcParams["xtick.labelsize"] = '//trim(xtick_labelsize_str))
     call me%add_str('matplotlib.rcParams["ytick.labelsize"] = '//trim(ytick_labelsize_str))
     call me%add_str('matplotlib.rcParams["legend.fontsize"] = '//trim(legend_fontsize_str))
-    if (me%usetex) call me%add_str('matplotlib.rcParams["text.usetex"] = True') 
+    if (me%usetex) call me%add_str('matplotlib.rcParams["text.usetex"] = True')
 
     call me%add_str('')
 
@@ -427,7 +427,7 @@ subroutine add_hist(me, x, label, xlim, ylim, xscale, yscale, bins, normed, cumu
                         trim(xname)//','//&
                         'label='//trim(me%raw_str_token)//'"'//trim(label)//'",'//&
                         'bins='//trim(binsstr)//','//&
-                        'cumulative='//trim(cumulativestr)//')') 
+                        'cumulative='//trim(cumulativestr)//')')
 
         !axis limits:
         if (allocated(xlimstr)) call me%add_str('ax.set_xlim('//xlimstr//')')