updated workflows for release prp, fixed old arg, made comment more specific

Author: vonHartz

.github/workflows/gh-test.yml

@@ -5,9 +5,9 @@ name: Test
 
 on:
   push:
-    branches: [ dev/jan ]
+    branches: [ master, dev/jan ]
   pull_request:
-    branches: [ dev/jan ]
+    branches: [ master, dev/jan ]
 
 jobs:
   build:

.github/workflows/install-from-pypi.yml

@@ -2,9 +2,9 @@ name: Test PyPI Installation
 
 on:
   push:
-    branches: [ dev/jan ]
+    branches: [ master, dev/jan ]
   pull_request:
-    branches: [ dev/jan ]
+    branches: [ master, dev/jan ]
 
 jobs:
   build:

.github/workflows/publish.yml

@@ -34,8 +34,7 @@ jobs:
         run: poetry install --no-interaction
       - name: Publish
         env:
-          PYPI_TOKEN: ${{ secrets.TestPYPI_TOKEN }}
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
         run: |
-          poetry config repositories.testpypi https://test.pypi.org/legacy/
-          poetry config pypi-token.testpypi $PYPI_TOKEN
-          poetry publish --build -r testpypi
+          poetry config pypi-token.pypi $PYPI_TOKEN
+          poetry publish --build -r pypi

mdp_playground/config_processor/config_processor.py

@@ -326,7 +326,7 @@ def get_list_of_varying_configs(var_configs, mode='grid', num_configs=None):
                     agent_config["agent"][key] = current_config[num_configs_done + list(var_configs[config_type]).index(key)]
 
                 elif config_type == "model":
-                    num_configs_done = len(list(var_configs["env"])) + len(list(var_agent_configs))
+                    num_configs_done = len(list(var_configs["env"])) + len(list(var_configs["agent"]))
                     model_config["model"][key] = current_config[num_configs_done + list(var_configs[config_type]).index(key)]
 
         combined_config = {**agent_config, **model_config, **env_config}

pyproject.toml

@@ -47,7 +47,8 @@ scipy = { version = "1.3.0", optional = true }
 #   { url = "https://ray-wheels.s3-us-west-2.amazonaws.com/master/8d0c1b5e068853bf748f72b1e60ec99d240932c6/ray-0.9.0.dev0-cp36-cp36m-manylinux1_x86_64.whl", optional = true, markers = "extra == 'extras_disc'"}
 #   ]
 
-# TODO: Poetry does not seem to support mutex extras
+# TODO: PEP 508 doees not allow url dependencies
+# see: https://github.com/python-poetry/poetry/issues/4107#issuecomment-854514939
 # tensorflow = [
 #   { version = "1.13.0rc1", optional = true, markers = "extra == 'extras_cont'" },
 #   { version = "2.2.0", optional = true, markers = "extra == 'extras_disc'" }

setup.py

@@ -12,6 +12,17 @@
 {'': ['*']}
 
 extras_require = [
+    'ray[rllib,debug]==0.7.3',
+    'tensorflow==2.2.0',
+    'pillow==6.1.0',
+    'pandas==0.25.0',
+    'requests==2.22.0',
+    'configspace==0.4.10',
+    'scipy==1.3.0',
+    'pandas==0.25.0',
+]
+
+extras_require_disc = [
     'ray[rllib,debug]==0.7.3',
     'tensorflow==1.13.0rc1',
     'pillow==6.1.0',