Add a Python 3.8 recipe and tag withn full version

niess · niess · commit 81e19862f5bb · 2019-11-02T22:10:18.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,7 @@ script:
   - # Test the Python AppImages
   - mkdir -p home/test/.local/lib/python2.7/site-packages
   - mkdir -p home/test/.local/lib/python3.7/site-packages
+  - mkdir -p home/test/.local/lib/python3.8/site-packages
   - HOME=$PWD/home/test USER=test PATH="$PWD/home/test/.local/bin:$PATH" python3 -m tests
 
 after_success:
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -17,7 +17,8 @@ wrapped_run() {
 }
 
 wrapped_run plugin
-wrapped_run python python2
-wrapped_run python python3
+wrapped_run python python2.7.17
+wrapped_run python python3.7.5
+wrapped_run python python3.8.0
 wrapped_run python scipy
 wrapped_run python xonsh
diff --git a/README.md b/README.md
@@ -17,15 +17,16 @@ are located on the [wiki][WIKI_DEVS].
 Ready to use [AppImage][APPIMAGE] distributions of [Python][PYTHON] are provided
 [below](##Downloads) or in the [release][RELEASE] area. A one liner example is:
 ```
-wget -cq https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python3-x86_64.AppImage && chmod u+x python3-x86_64.AppImage && ./python3-x86_64.AppImage
+wget -cq https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python3.8.0-x86_64.AppImage && chmod u+x python3.8.0-x86_64.AppImage && ./python3.8.0-x86_64.AppImage
 ```
 which will install and run a [Python][PYTHON] instance.  See the instructions on
 the [wiki][WIKI_USERS] for more detailed usage.
 
 ## Downloadable AppImages
 
-[![Python 2](https://img.shields.io/badge/python2-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python2-x86_64.AppImage)
-[![Python 3](https://img.shields.io/badge/python3-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python3-x86_64.AppImage)
+[![Python 2.7](https://img.shields.io/badge/python2.7-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python2.7.17-x86_64.AppImage)
+[![Python 3.7](https://img.shields.io/badge/python3.7-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python3.7.5-x86_64.AppImage)
+[![Python 3.8](https://img.shields.io/badge/python3.8-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/python3.8.0-x86_64.AppImage)
 [![Scipy](https://img.shields.io/badge/scipy-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/scipy-x86_64.AppImage)
 [![Xonsh](https://img.shields.io/badge/xonsh-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/xonsh-x86_64.AppImage)
 [![Plugin](https://img.shields.io/badge/plugin-x86_64-blue.svg)](https://github.com/niess/linuxdeploy-plugin-python/releases/download/continuous/linuxdeploy-plugin-python-x86_64.AppImage)
diff --git a/appimage/recipes/python2.7.17.sh b/appimage/recipes/python2.7.17.sh
@@ -0,0 +1,2 @@
+export PYTHON_VERSION="2.7.17"
+export PIP_REQUIREMENTS=
diff --git a/appimage/recipes/python2.sh b/appimage/recipes/python2.sh
diff --git a/appimage/recipes/python3.7.5.sh b/appimage/recipes/python3.7.5.sh
@@ -0,0 +1,2 @@
+export PYTHON_VERSION="3.7.5"
+export PIP_REQUIREMENTS=
diff --git a/appimage/recipes/python3.8.0.sh b/appimage/recipes/python3.8.0.sh
@@ -0,0 +1,2 @@
+export PYTHON_VERSION="3.8.0"
+export PIP_REQUIREMENTS=
diff --git a/appimage/recipes/python3.sh b/appimage/recipes/python3.sh
diff --git a/appimage/recipes/scipy.sh b/appimage/recipes/scipy.sh
@@ -1,4 +1,4 @@
-export PYTHON_VERSION="3.7.3"
+export PYTHON_VERSION="3.7.5"
 export PIP_REQUIREMENTS="numpy scipy matplotlib sympy pandas"
 
 export LD_LIBRARY_PATH="AppDir/usr/python/lib/python3.7/site-packages/numpy/.libs:${LD_LIBRARY_PATH}"
diff --git a/appimage/recipes/xonsh.sh b/appimage/recipes/xonsh.sh
@@ -1,4 +1,4 @@
-export PYTHON_VERSION="3.7.3"
+export PYTHON_VERSION="3.7.5"
 export PIP_REQUIREMENTS="xonsh prompt_toolkit gnureadline Pygments"
 export PYTHON_ENTRYPOINT='"-u" "-c" "from xonsh.main import main; main()"'
 export LD_LIBRARY_PATH="AppDir/usr/python/lib/python3.7/site-packages/.libsgnureadline:${LD_LIBRARY_PATH}"
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
@@ -6,7 +6,7 @@
 import sys
 
 
-TAGS = ("python2", "python3")
+TAGS = ("python2.7.17", "python3.7.5", "python3.8.0")
 
 TESTDIR = "/tmp/test-linuxdeploy-plugin-python"
 ROOTDIR = os.path.realpath(os.path.dirname(__file__) + "/..").strip()
@@ -78,35 +78,54 @@ def __init__(self, *args, **kwargs):
                 os.path.join(TESTDIR, appimage))
 
 
-    def test_python3_base(self):
+    def test_python38_base(self):
         """Test the base functionalities of a Python 3 AppImage
         """
-        self.check_base("python3")
+        self.check_base("python3.8.0")
 
-    def test_python3_modules(self):
+
+    def test_python38_modules(self):
+        """Test the modules availability of a Python 3 AppImage
+        """
+        self.check_modules("python3.8.0")
+
+
+    def test_python38_venv(self):
+        """Test venv from a Python 3 AppImage
+        """
+        self.check_venv("python3.8.0")
+
+
+    def test_python37_base(self):
+        """Test the base functionalities of a Python 3 AppImage
+        """
+        self.check_base("python3.7.5")
+
+
+    def test_python37_modules(self):
         """Test the modules availability of a Python 3 AppImage
         """
-        self.check_modules("python3")
+        self.check_modules("python3.7.5")
 
 
-    def test_python3_venv(self):
+    def test_python37_venv(self):
         """Test venv from a Python 3 AppImage
         """
-        self.check_venv("python3")
+        self.check_venv("python3.7.5")
 
 
     def test_python2_base(self):
         """Test the base functionalities of a Python 2 AppImage
         """
-        self.check_base("python2")
+        self.check_base("python2.7.17")
 
 
     def check_base(self, tag):
         """Check the base functionalities of a Python AppImage
         """
         version = get_version(tag)
         appimage = "python{:}-{:}.AppImage".format(
-            version[0], os.getenv("ARCH"))
+            version, os.getenv("ARCH"))
 
         # Check the Python system configuration
         python = os.path.join(TESTDIR, appimage)
@@ -139,7 +158,7 @@ def check_venv(self, tag):
         """
         version = get_version(tag)
         appimage = "python{:}-{:}.AppImage".format(
-            version[0], os.getenv("ARCH"))
+            version, os.getenv("ARCH"))
 
         # Generate a virtual environment
         if os.path.exists("ENV"):
@@ -187,7 +206,7 @@ def check_modules(self, tag):
         """
         version = get_version(tag)
         appimage = "python{:}-{:}.AppImage".format(
-            version[0], os.getenv("ARCH"))
+            version, os.getenv("ARCH"))
 
         def import_(module):
             system("./{:} -c 'import {:}'".format(appimage, module))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export PYTHON_VERSION="2.7.17"`
	`2`	`+export PIP_REQUIREMENTS=`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export PYTHON_VERSION="3.7.5"`
	`2`	`+export PIP_REQUIREMENTS=`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export PYTHON_VERSION="3.8.0"`
	`2`	`+export PIP_REQUIREMENTS=`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export PYTHON_VERSION="3.7.3"`
	`1`	`+export PYTHON_VERSION="3.7.5"`
`2`	`2`	`export PIP_REQUIREMENTS="numpy scipy matplotlib sympy pandas"`
`3`	`3`
`4`	`4`	`export LD_LIBRARY_PATH="AppDir/usr/python/lib/python3.7/site-packages/numpy/.libs:${LD_LIBRARY_PATH}"`