This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/develop by this push:
new ca4e1f35 Revert "AIRAVATA-3529 Add support for Python 3.10"
ca4e1f35 is described below
commit ca4e1f358b2e5936e15de7326b366fbc7fb63bd9
Author: Marcus Christie <[email protected]>
AuthorDate: Fri Dec 9 17:25:08 2022 -0500
Revert "AIRAVATA-3529 Add support for Python 3.10"
This reverts commit 073d14fcfa668faa68a1b4da9552d3f125a2d3e7.
---
Dockerfile | 2 +-
README.md | 4 ++--
docs/tutorial/custom_ui_tutorial.md | 24 ++++++++++++------------
requirements.txt | 8 +++-----
tox.ini | 2 +-
5 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 38089d83..eee57597 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,7 +62,7 @@ RUN yarn run build
-FROM python:3.10-slim as server-stage
+FROM python:3.9-slim as server-stage
ENV PYTHONUNBUFFERED 1
diff --git a/README.md b/README.md
index 3f04f010..5f776a26 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ Django Portal locally. This will allow you to try it out and
can also be used as
a development environment. If you just want to run the Airavata Django Portal
locally, see the Docker instructions below for a more simplified approach.
-The Airavata Django Portal works with Python versions 3.6 - 3.10. You'll need
-one of these versions installed locally.
+The Airavata Django Portal works with Python versions 3.6, 3.7, 3.8 and 3.9.
+You'll need one of these versions installed locally.
You'll also need Node.js and yarn to build the JavaScript frontend code. Please
install
diff --git a/docs/tutorial/custom_ui_tutorial.md
b/docs/tutorial/custom_ui_tutorial.md
index cac51519..df883229 100644
--- a/docs/tutorial/custom_ui_tutorial.md
+++ b/docs/tutorial/custom_ui_tutorial.md
@@ -10,7 +10,7 @@ Tutorial attendees should have:
- a text editor or IDE for writing Python and web code. Any text editor or
IDE
will do but if you're looking for recommendations, I recommend
[Visual Studio Code](https://code.visualstudio.com/).
-- Python (3.6 - 3.10, but latest version is recommended)
+- latest Python (current version as of this writing is 3.9.5)
- Git client
- [Docker Desktop](https://www.docker.com/products/docker-desktop)
- If you don't have Docker installed or can't install it, you'll also need:
@@ -20,27 +20,27 @@ Tutorial attendees should have:
### Installing Python
-Python 3.6-3.10 are supported. If you don't have Python installed, I recommend
-you download and use the latest (Python 3.10 as of this writing).
+Python 3.6-3.9 are supported, but I highly recommend you download and use
+**Python 3.9**
-Download and install Python.
+Download and install Python 3.9.
- (macOS/Windows): Download from <https://www.python.org/downloads/>
-- (Linux): use your distribution's package manager to install Python
+- (Linux): use your distribution's package manager to install Python 3.9
-Verify you have installed Python:
+Verify you have installed Python 3.9:
=== "macOS/Linux"
- $ python3 --version
- Python 3.10.0
+ $ python3.9 --version
+ Python 3.9.5
=== "Windows"
Open PowerShell then run:
PS C:\Users\username> py --version
- Python 3.10.0
+ Python 3.9.5
### Installing Git
@@ -534,7 +534,7 @@ can install in which we can write the custom output view
code.
=== "macOS/Linux"
$ cd $HOME
- $ python3 -m venv tutorial-env
+ $ python3.9 -m venv tutorial-env
$ source tutorial-env/bin/activate
(tutorial-env) $
@@ -615,7 +615,7 @@ the settings_local.py file for local development. Move or
copy it to the
Verify that you have the following installed
- - Python 3
+ - Python 3.9
- Node LTS
- Yarn
- Git
@@ -661,7 +661,7 @@ the settings_local.py file for local development. Move or
copy it to the
Verify that you have the following installed
- - Python 3
+ - Python 3.9
- Node LTS
- Yarn
- Git
diff --git a/requirements.txt b/requirements.txt
index 5f9f57a8..1ec1b8cc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,12 +19,10 @@ papermill==1.0.1
# gRPC libs
google-api-python-client==1.12.8
-grpcio-tools==1.48.2 ; python_version < "3.7"
-grpcio-tools==1.51.1 ; python_version >= "3.7"
-grpcio==1.48.2 ; python_version < "3.7"
-grpcio==1.51.1 ; python_version >= "3.7"
+grpcio-tools==1.34.1
+grpcio==1.34.1
-airavata-django-portal-sdk==1.8.0
+airavata-django-portal-sdk==1.7.0
airavata-python-sdk==1.0.2
airavata-django-portal-commons==1.0.0
diff --git a/tox.ini b/tox.ini
index 53a045d2..90399c76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ envlist = py36, py37, py38, py39, py310 #, py311
[testenv]
deps =
- py{3,36,37,38,39,310,311}: -rrequirements-dev.txt
+ py{3,36,37,38,39}: -rrequirements-dev.txt
commands =
./runtests.py
