diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5ea2ea1d..159ecbec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: - python-version: [ '3.6','3.7' ] + python-version: [ '3.6','3.7','3.8' ] platform: [ubuntu-20.04, windows-2019, macOS-10.15] runs-on: ${{ matrix.platform }} @@ -56,17 +56,31 @@ jobs: with: auto-update-conda: true python-version: ${{ matrix.python-version }} + activate-environment: test + + - name: Update conda env dependencies + shell: bash -l {0} + run: | + conda config --set ssl_verify no + conda install pytorch==1.4.0 torchvision==0.5.0 cpuonly -c pytorch + pip install -f https://github.com/Kojoley/atari-py/releases atari_py + conda env update environment.yml # Install Dependencies - name: Install Windows dependencies + shell: pwsh if: startsWith(runner.os, 'Windows') run: | ./.scripts/windows_cpu_build.ps1 - name: Install Linux Dependencies + shell: bash -l {0} if: startsWith(runner.os, 'macOS') || startsWith(runner.os, 'Linux') run: | ./.scripts/unix_cpu_build.sh - name: Tests - run: pytest --durations=0 + shell: bash -l {0} + run: | + conda activate test + pytest --durations=0 diff --git a/.scripts/unix_cpu_build.sh b/.scripts/unix_cpu_build.sh index 8bb5b134..03b7c0c9 100755 --- a/.scripts/unix_cpu_build.sh +++ b/.scripts/unix_cpu_build.sh @@ -1,5 +1,7 @@ #!/bin/sh +conda install -c conda-forge swig python -m pip install --upgrade pip +pip install cmake pip install torch==1.4.0 --quiet --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade -pip install -r requirements.txt +# pip install -r requirements.txt diff --git a/.scripts/windows_cpu_build.ps1 b/.scripts/windows_cpu_build.ps1 index cd724a12..e0aa5c12 100644 --- a/.scripts/windows_cpu_build.ps1 +++ b/.scripts/windows_cpu_build.ps1 @@ -3,4 +3,4 @@ conda install -c conda-forge swig python -m pip install --upgrade pip pip install torch==1.4.0 --quiet --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade -pip install -r requirements.txt +# pip install -r requirements.txt diff --git a/README.md b/README.md index 5c0cce24..4e16826b 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@
[![pypi](https://img.shields.io/badge/pypi%20package-v0.0.2-blue)](https://pypi.org/project/genrl/) +[![PyPI pyversions](https://img.shields.io/pypi/pyversions/genrl.svg)](https://pypi.python.org/pypi/ansicolortags/) [![Downloads](https://pepy.tech/badge/genrl)](https://pepy.tech/project/genrl) [![codecov](https://codecov.io/gh/SforAiDl/genrl/branch/master/graph/badge.svg)](https://codecov.io/gh/SforAiDl/genrl) [![GitHub license](https://img.shields.io/github/license/SforAiDl/genrl)](https://github.com/SforAiDl/genrl/blob/master/LICENSE) diff --git a/environment.yml b/environment.yml new file mode 100644 index 00000000..013f5ec9 --- /dev/null +++ b/environment.yml @@ -0,0 +1,67 @@ +name: test +channels: + - conda-forge + - soumith + - defaults +dependencies: + - ca-certificates=2020.6.20 + - libcxx + - libffi=3.2.1 + - openssl=1.1.1g + - pcre=8.44 + - pip=20.2.3 + #- python=3.8.5=h0ed32c4_8_cpython + #- python_abi=3.8=1_cp38 + - sqlite=3.33.0 + - swig=4.0.2 + - tk=8.6.10 + - wheel=0.35.1 + - xz=5.2.5 + - zlib=1.2.11 + - pip: + - absl-py==0.10.0 + - appdirs==1.4.4 + #- atari-py==0.2.6 + - attrs==20.2.0 + - box2d-py==2.3.8 + - certifi==2019.11.28 + - cfgv==3.2.0 + - cloudpickle==1.3.0 + - cmake==3.18.2.post1 + - cycler==0.10.0 + - distlib==0.3.1 + - filelock==3.0.12 + - future==0.18.2 + - grpcio==1.32.0 + - gym==0.17.1 + - identify==1.5.3 + - importlib-resources==1.0.1 + - kiwisolver==1.2.0 + - markdown==3.2.2 + - matplotlib==3.2.1 + - more-itertools==8.5.0 + - nodeenv==1.5.0 + - numpy==1.18.2 + - opencv-python==4.2.0.34 + - packaging==20.4 + - pandas==1.0.4 + - pillow==7.1.0 + - pluggy==0.13.1 + - pre-commit==2.4.0 + - protobuf==3.13.0 + - py==1.9.0 + - pyglet==1.5.0 + - pyparsing==2.4.7 + - pytest==5.4.1 + - python-dateutil==2.8.1 + - pytz==2020.1 + - pyyaml==5.3.1 + - scipy==1.4.1 + - setuptools==41.0.0 + - six==1.14.0 + - tensorboard==1.15.0 + - toml==0.10.1 + - torchvision==0.5.0 + - virtualenv==20.0.31 + - wcwidth==0.2.5 + - werkzeug==1.0.1 diff --git a/requirements.txt b/requirements.txt index c0c9bced..ed8a32f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ certifi==2019.11.28 cloudpickle==1.3.0 future==0.18.2 gym==0.17.1 +gym[atari] numpy==1.18.2 opencv-python==4.2.0.34 pandas==1.0.4 @@ -19,3 +20,4 @@ tensorboard==1.15.0 pre-commit==2.4.0 importlib-resources==1.0.1 setuptools==41.0.0 +wheel==0.35.1 \ No newline at end of file