Preparation of v1.0.0

Author: detlefarend

doc/rtd/conf.py

@@ -22,7 +22,7 @@
 author = 'Detlef Arend, Steve Yuwono, Laxmikant Shrikant Baheti et al'
 
 # The full version, including alpha/beta/rc tags
-release = '0.1.0'
+release = '1.0.0'
 
 
 # -- General configuration ---------------------------------------------------

doc/rtd/requirements.txt

@@ -1,7 +1,7 @@
 mlpro[full]
-pettingzoo>=1.22.3
 pygame>=2.1.3
 pymunk>=6.4.0
+pettingzoo>=1.22.3
 
 sphinxcontrib-napoleon
 sphinx-copybutton

requirements.txt

@@ -1,4 +1,4 @@
-mlpro[full]>=1.3.1
-pettingzoo>=1.22.3
+mlpro[full]>=1.4.0
 pygame>=2.1.3
-pymunk>=6.4.0
+pymunk>=6.4.0
+pettingzoo>=1.22.3

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mlpro-int-pettingzoo
-version = 0.1.0
+version = 1.0.0
 author = MLPro Team
 author_email = mlpro@listen.fh-swf.de
 description = MLPro: Integration PettingZoo
@@ -26,8 +26,8 @@ where = src
 
 [options.extras_require]
 full =
-    mlpro[full]>=1.3.1
-    pettingzoo>=1.22.3
+    mlpro[full]>=1.4.0
     pygame>=2.1.3
     pymunk>=6.4.0
+    pettingzoo>=1.22.3
 

src/mlpro_int_pettingzoo/__init__.py

@@ -0,0 +1 @@
+from mlpro_int_pettingzoo.wrappers import *

src/mlpro_int_pettingzoo/wrappers/basics.py

@@ -46,10 +46,11 @@
 ## -- 2023-03-26  2.2.0     DA       Class WrEnvPZOO2MLPro: refactoring of persistence
 ## -- 2024-01-23  2.3.0     SY       Debug due to introduction of PettingZoo version 1.24.3
 ## -- 2024-02-16  2.3.1     SY       Wrapper Relocation from MLPro to MLPro-Int-PettingZoo
+## -- 2024-04-19  2.4.0     DA       Alignment with MLPRO 1.4.0
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 2.3.1 (2024-02-16)
+Ver. 2.4.0 (2024-04-19)
 
 This module provides wrapper classes for PettingZoo multi-agent environments.
 
@@ -61,7 +62,7 @@
 import gymnasium
 from pydoc import locate
 import numpy as np
-from mlpro.wrappers.models import Wrapper
+from mlpro.wrappers import Wrapper
 from mlpro.rl import *
 from pettingzoo import AECEnv
 from pettingzoo.utils import agent_selector

src/setup.py

@@ -2,7 +2,7 @@
 
 
 setup(name='mlpro-int-pettingzoo',
-version='0.1.0',
+version='1.0.0',
 description='MLPro: Integration PettingZoo',
 author='MLPro Team',
 author_mail='mlpro@listen.fh-swf.de',
@@ -12,10 +12,10 @@
 # Package dependencies for full installation
 extras_require={
     "full": [
-        "mlpro[full]>=1.3.1",
-        "pettingzoo>=1.22.3",
+        "mlpro[full]>=1.4.0",
         "pygame>=2.1.3",
-        "pymunk>=6.4.0"
+        "pymunk>=6.4.0",
+        "pettingzoo>=1.22.3"
     ],
 },
 

test/howtos/rl/howto_rl_wp_001_mlpro_environment_to_petting_zoo_environment.py

@@ -28,7 +28,7 @@
 
 
 from mlpro.bf.various import Log
-from mlpro_int_pettingzoo.wrappers import WrEnvMLPro2PZoo
+from mlpro_int_pettingzoo import WrEnvMLPro2PZoo
 from mlpro.rl.pool.envs.bglp import BGLP
 from pettingzoo.test import api_test
 

test/howtos/rl/howto_rl_wp_002_run_multiagent_with_own_policy_on_petting_zoo_environment.py

@@ -53,7 +53,7 @@
 from pettingzoo.classic import connect_four_v3
 from mlpro.bf.math import *
 from mlpro.rl import *
-from mlpro_int_pettingzoo.wrappers import WrEnvPZOO2MLPro
+from mlpro_int_pettingzoo import WrEnvPZOO2MLPro
 from mlpro.rl.pool.policies.randomgenerator import RandomGenerator