Fixed $SHELL

README.md

@@ -8,7 +8,7 @@ Dependencies
 ------------
 
 - GNU make (>= 3.81 recommended)
-- Python > 2.3
+- Python >2.6
 - Any Fortran 90 compiler (Intel recommended)
 
 Installing IRPF90

bin/irpman

@@ -29,7 +29,7 @@
 case "$0" in
   *irpman)
    if [[ -z $1 ]] ; then
-      if [[ $(basename $SHELL) == "zsh" ]]
+      if [[ $(ps -p $$ -ocomm=) == "zsh" ]]
       then
         source $(dirname $0)/../irpman-completions.bash
       else

irpman-completions.bash

@@ -24,7 +24,7 @@
 #   31062 Toulouse Cedex 4      
 #   scemama@irsamc.ups-tlse.fr
 
-if [[ $(basename $SHELL) == "zsh" ]]
+if [[ $(ps -p $$ -ocomm=) == "zsh" ]]
 then
         autoload bashcompinit
         bashcompinit

pip/setup.py

@@ -1,19 +1,31 @@
-from distutils.core import setup
+import sys
-import os
+
-os.path.append("../src")
+sys.path.append("../src")
 import version
 
-setup(
+
+import setuptools
+
+with open("../README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
   name = 'irpf90',
-  packages = ['irpf90_libs'], # this must be the same as the name above
   version = version.version,
-  description = 'IRPF90 is a Fortran90 preprocessor written in Python for programming using the Implicit Reference to Parameters (IRP) method. It simplifies the development of large fortran codes in the field of scientific high performance computing.',
+  scripts = ["irpf90", "irpman", "irpf90_indent"],
   author = 'Anthony Scemama',
   author_email = 'scemama@irsamc.ups-tlse.fr',
-  url = 'http://irpf90.ups-tlse.fr', 
+  description = 'IRPF90 is a Fortran90 preprocessor written in Python for programming using the Implicit Reference to Parameters (IRP) method. It simplifies the development of large fortran codes in the field of scientific high performance computing.',
+  long_description=long_description,
+  long_description_content_type="text/markdown",
+  url="https://irpf90.ups-tlse.fr",
   download_url = 'https://gitlab.com/scemama/irpf90/archive/v1.7.4.tar.gz',
+  packages=setuptools.find_packages(),
+  classifiers=[
+         "Programming Language :: Python :: 2",
+         "Programming Language :: Fortran",
+         "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
+         "Operating System :: POSIX :: Linux",
+     ],
   keywords = ['programming', 'fortran', 'IRP'], 
-  classifiers = [],
+ )
-  scripts = ["irpf90", "irpman", "irpf90_indent"],
-)
-