From 5f6e4f855551aac9ece93533ceeacca8e97e1ad1 Mon Sep 17 00:00:00 2001 From: Atsushi Sakai Date: Sun, 5 Jul 2020 21:15:18 +0900 Subject: [PATCH] Dependency setting clean up (#348) * requiirements.txt use specific version * use appveyor * fix appveyor * fix appveyor * fix appveyor --- .travis.yml | 35 ----------------------------------- CONTRIBUTING.md | 2 +- appveyor.yml | 1 + environment.yml | 5 ++--- requirements.txt | 10 +++++----- 5 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 99d239217b3..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: python - -matrix: - include: - - os: linux - -python: - - 3.8 - -before_install: - - sudo apt-get update - - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - - chmod +x miniconda.sh - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH="$HOME/miniconda/bin:$PATH" - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - # Useful for debugging any issues with conda - - conda info -a - -install: - - conda install numpy - - conda install scipy - - conda install matplotlib - - conda install pandas - - pip install cvxpy - - conda install coveralls - -script: - - python --version - - ./runtests.sh - -after_success: - - coveralls diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd41946b655..91f6dfa822a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,6 +18,6 @@ Please check this paper to understand the philosophy of this project. ## Check your Python version. -We only accept a PR for Python 3.6.x or higher. +We only accept a PR for Python 3.8.x or higher. We will not accept a PR for Python 2.x. diff --git a/appveyor.yml b/appveyor.yml index f34bcb2b28e..b883397d71d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,6 +34,7 @@ install: - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH% - SET PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin - conda config --set always_yes yes --set changeps1 no + - conda config --append channels conda-forge - conda update -q conda - conda info -a - conda env create -f C:\\projects\pythonrobotics\environment.yml diff --git a/environment.yml b/environment.yml index da1c3c0a6f7..fdfd25ca0a3 100644 --- a/environment.yml +++ b/environment.yml @@ -2,10 +2,9 @@ name: python_robotics dependencies: - python - pip -- matplotlib - scipy - numpy - pandas +- cvxpy +- matplotlib - coverage -- pip: - - cvxpy diff --git a/requirements.txt b/requirements.txt index 1398664be80..775486efa37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -numpy -pandas -scipy -matplotlib -cvxpy +numpy == 1.19.0 +scipy == 1.5.1 +pandas == 1.0.5 +matplotlib == 3.2.2 +cvxpy == 1.1.1