diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md index 4d25a843c..5c3c41a55 100644 --- a/.github/ISSUE_TEMPLATE/---bug-report.md +++ b/.github/ISSUE_TEMPLATE/---bug-report.md @@ -32,12 +32,12 @@ Steps to reproduce the behavior: ## Environment - MARO version (e.g., v0.1.1a1): -- MARO scenario (`CIM`, `Citi Bike`): +- MARO scenario (`CIM`, `Citi Bike`, `VM Scheduling`): - MARO component (`Simulation`, `RL`, `Distributed Training`): - Orchestration platform (`GraSS on Azure`, `AKS on Azure`): - How you installed MARO (`pip`, `source`): - OS (`Linux`, `Windows`, `macOS`): -- Python version (`3.6`, `3.7`): +- Python version (`3.7`, `3.8`, `3.9`): - Docker image (e.g., maro2020/maro:latest): - CPU/GPU: - Any other relevant information: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 312429796..2be883cbe 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -31,8 +31,9 @@ Please also add other related information/contexts/dependencies here. - [ ] Mac OS - [ ] Linux - Python version: - - [ ] 3.6 - [ ] 3.7 + - [ ] 3.8 + - [ ] 3.9 - Key information snapshot(s): ## Needs Follow Up Actions diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 1cbcb0ce2..66ae53ae0 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: [3.6, 3.7] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/deploy_docker_image.yml b/.github/workflows/deploy_docker_image.yml index a876abf93..7d35e204a 100644 --- a/.github/workflows/deploy_docker_image.yml +++ b/.github/workflows/deploy_docker_image.yml @@ -21,10 +21,10 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - name: Set up Python 3.6 + - name: Set up Python 3.7 uses: actions/setup-python@v2 with: - python-version: 3.6 + python-version: 3.7 - name: Build image run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 302ae9279..4493fa1f5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,3 @@ - name: test on: @@ -14,7 +13,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, windows-latest, macos-latest] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/test_with_cli.yml b/.github/workflows/test_with_cli.yml index c17d95c3b..8a766a7d1 100644 --- a/.github/workflows/test_with_cli.yml +++ b/.github/workflows/test_with_cli.yml @@ -2,6 +2,7 @@ name: test_with_cli on: pull_request_review: + branches: [ master, v0.1, v0.2, v0.3 ] types: [ submitted ] workflow_dispatch: diff --git a/docs/source/installation/grass_on_premises_cluster_provisioning.rst b/docs/source/installation/grass_on_premises_cluster_provisioning.rst index 4a5867153..1e42314f1 100644 --- a/docs/source/installation/grass_on_premises_cluster_provisioning.rst +++ b/docs/source/installation/grass_on_premises_cluster_provisioning.rst @@ -10,7 +10,7 @@ in local private network and run your training job in On-Premises distributed en Prerequisites ------------- -* Linux with Python 3.6+ +* Linux with Python 3.7+ * `Install Powershell `_ if you are using Windows Server * For master node vm, need install flask, gunicorn, and redis. @@ -96,4 +96,4 @@ grass-on-premises-join-cluster config: install_node_runtime: true - install_node_gpu_support: false \ No newline at end of file + install_node_gpu_support: false diff --git a/docs/source/installation/multi_processes_localhost_provisioning.rst b/docs/source/installation/multi_processes_localhost_provisioning.rst index 187c34053..f6e4b3492 100644 --- a/docs/source/installation/multi_processes_localhost_provisioning.rst +++ b/docs/source/installation/multi_processes_localhost_provisioning.rst @@ -5,7 +5,7 @@ the multi-processes in the localhost environment. Prerequisites ------------- -* Linux with Python 3.6+ +* Linux with Python 3.7+ * Redis Cluster Management diff --git a/docs/source/installation/pip_install.rst b/docs/source/installation/pip_install.rst index 3616a9e86..35b21afaa 100644 --- a/docs/source/installation/pip_install.rst +++ b/docs/source/installation/pip_install.rst @@ -25,7 +25,7 @@ Install MARO from Source (\ `Editable Mode = 3.6, < 3.8 `_ + * `Python >= 3.7 `_ * C++ Compiler * Linux or Mac OS X: ``gcc`` diff --git a/docs/source/key_components/geographic_visualization.rst b/docs/source/key_components/geographic_visualization.rst index a5dfd72eb..406e0bded 100644 --- a/docs/source/key_components/geographic_visualization.rst +++ b/docs/source/key_components/geographic_visualization.rst @@ -12,7 +12,7 @@ local mode for the finished epoch under real-time mode. Dependency ---------- -Env-geographic's startup depends on **docker** and **docker-compose**. +Env-geographic's startup depends on **docker** and **docker-compose**. Therefore, users need to install docker on the machine and ensure that it can run normally. User could get docker through `Docker installation `_. @@ -44,7 +44,7 @@ Firstly, user need to start the local database with command: ---- After the command is executed successfully, user -could view the local data with localhost:9000 by default. +could view the local data with localhost:9000 by default. If the default port is occupied, user could obtain the access port of each container through the following command: @@ -91,7 +91,7 @@ To send data to database, there are 2 compulsory steps: User needs to set the value of the environment variable "MARO_STREAMIT_ENABLED" to "true". If user wants to specify the experiment name, -set the environment variable "MARO_STREAMIT_EXPERIMENT_NAME". If user does not +set the environment variable "MARO_STREAMIT_EXPERIMENT_NAME". If user does not set this value, a unique experiment name would be processed automatically. User could check the experiment name through database. It should be noted that when selecting a topology, user must select a topology with specific geographic @@ -118,7 +118,7 @@ package **streamit** with following code before environment initialization: # Initialize environment and send basic information of experiment to database. env = Env(scenario="cim", topology="global_trade.22p_l0.1", start_tick=0, durations=100) - + for ep in range(EPISODE_NUMBER): # Send experimental data to database by episode. streamit.episode(ep) @@ -144,8 +144,8 @@ command: ---- -Generally, the backend service runs on a local machine, occupying port 5000. -If port 5000 is already occupied, the program would find another free port starting from 5000. +Generally, the backend service runs on a local machine, occupying port 5000. +If port 5000 is already occupied, the program would find another free port starting from 5000. To be specific, if user would like to run the backend service in docker rather on a local machine, please run the shell script run_docker.sh under the folder maro\maro\cli\maro_real_time_vis. It should be noted that diff --git a/scripts/build_manylinux.sh b/scripts/build_manylinux.sh index f8e0892f8..fe1187499 100644 --- a/scripts/build_manylinux.sh +++ b/scripts/build_manylinux.sh @@ -1,6 +1,6 @@ #!/bin/bash -# this script used build maro packages for linux +# this script used build maro packages for linux cd "$(dirname $(readlink -f $0))/.." @@ -8,4 +8,4 @@ bash ./scripts/compile_cython.sh # NOTE: currently we only support python3.6 and 3.7, need to be clearfy the python and packages version # about manylinux: https://github.com/pypa/manylinux -docker run --rm -v "$PWD":/maro quay.io/pypa/manylinux2010_x86_64 bash /maro/scripts/build_wheel.sh \ No newline at end of file +docker run --rm -v "$PWD":/maro quay.io/pypa/manylinux2010_x86_64 bash /maro/scripts/build_wheel.sh diff --git a/setup.py b/setup.py index 88763dee4..67ff27bf6 100644 --- a/setup.py +++ b/setup.py @@ -117,12 +117,11 @@ 'Operating System :: Unix', "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Topic :: Scientific/Engineering :: Artificial Intelligence"], - python_requires=">=3.6", + python_requires=">=3.7", setup_requires=[ "numpy<1.20.0", ],