Merge pull request #169 from rosswhitfield/update_ci_deps

Update CI test versions

.github/workflows/conda_env/environment_linux.yml

@@ -6,6 +6,6 @@ dependencies:
 - pytest-timeout
 - psutil
 - mpi4py
-- dask=2022.06.0
+- dask=2022.08.1
 - dakota
 - coverage!=6.3

.github/workflows/conda_env/environment_macos.yml

@@ -5,5 +5,5 @@ dependencies:
 - pytest-cov
 - pytest-timeout
 - psutil
-- dask=2022.06.0
+- dask=2022.08.1
 - coverage!=6.3

.github/workflows/conda_env/environment_static_analysis.yml

@@ -3,9 +3,9 @@ channels:
 - conda-forge
 dependencies:
 - python=3.8
-- flake8=4.0.1
-- pylint=2.14.2
+- flake8=5.0.4
+- pylint=2.15.0
 - bandit=1.7.4
-- codespell=2.1.0
-- dask=2022.06.0
+- codespell=2.2.1
+- dask=2022.08.1
 - pytest

components/drivers/elwasif/elwasif_driver.py

@@ -33,7 +33,7 @@ def step(self, timestamp=0):
         rfComp = services.get_port('RF_IC')
         profAdvanceComp = services.get_port('PROFILE_ADVANCE')
 
-        if(rfComp is None or profAdvanceComp is None):
+        if rfComp is None or profAdvanceComp is None:
             print('Error accessing physics components')
             sys.exit(1)
 

doc/examples/component_skeleton.py

@@ -179,7 +179,7 @@ def step(self, timeStamp):
         power_ic = ps.variables['power_ic'].getValue()[0]
         ps.close()
         print('power = ', power_ic)
-        if(-0.02 < power_ic < 0.02):
+        if -0.02 < power_ic < 0.02:
             retcode = subprocess.call([zero_RF_IC_power, cur_state_file])
             if (retcode != 0):
                 print('Error executing ', prepare_input)
@@ -197,7 +197,7 @@ def step(self, timeStamp):
 # retain power from previous time step i.e. leave sources untouched in the state.
 # However power_ic needs to be reset back to positive
 
-        elif(power_ic < -0.02):
+        elif power_ic < -0.02:
             print('continuing power from previous time step')
             ps.variables['power_ic'].assignValue(-power_ic)
             ps.close()

doc/user_guides/config_file.rst

@@ -45,7 +45,7 @@ These items describe this configuration and is used for describing and locating
 
 \*\* Mandatory items: *SIM_ROOT*, *SIM_NAME*, *LOG_FILE*
 
-*RUN_ID*, *TOKOMAK_ID*, *SHOT_NUMBER* - identifiers for the simulation that are helpful for SWIM users.  They ore often used to form a hierarchical name for the simulation, identifying related runs.
+*RUN_ID*, *TOKOMAK_ID*, *SHOT_NUMBER* - identifiers for the simulation that are helpful for SWIM users.  They are often used to form a hierarchical name for the simulation, identifying related runs.
 
 *OUTPUT_PREFIX* - used to prevent collisions and overwriting of different simulations using the same *SIM_ROOT*.
 

ipsframework/ipsLogging.py

@@ -131,7 +131,7 @@ def __run__(self):
                     self.add_sim_log(tokens[1], tokens[2])
                 elif tokens[0] == 'END_SIM':  # Expecting Message 'END_SIM log_pipe_name'
                     log_pipe_name = tokens[1]
-                    for fileno, (recvr, _, f_name) in list(self.log_map.items()):
+                    for fileno, (recvr, _, f_name) in self.log_map.copy().items():
                         if f_name == log_pipe_name:
                             del recvr
                             del self.log_map[fileno]

ipsframework/services.py

@@ -1770,7 +1770,7 @@ def publish(self, topicName, eventName, eventBody):
 
     def subscribe(self, topicName, callback):
         """
-        Subscribe to topic *topicName* on the IPS event service and register *callback* as the method to be invoked whem an event is published to that topic.
+        Subscribe to topic *topicName* on the IPS event service and register *callback* as the method to be invoked when an event is published to that topic.
         """
         if not topicName.startswith('_IPS'):
             topicName = self.sim_name + '_' + topicName

tests/components/drivers/basic_concurrent1.py

@@ -31,7 +31,7 @@ def step(self, timestamp=0.0, **keywords):
         w3 = self.services.get_port('WORKER3')
 
         # should we do something different here?????  a try block?
-        if(w1 is None or w2 is None or w3 is None):
+        if w1 is None or w2 is None or w3 is None:
             print('Error accessing physics components')
             raise Exception('Error accessing physics components')
 

tests/components/drivers/basic_serial1.py

@@ -29,7 +29,7 @@ def step(self, timestamp=0.0, **keywords):
         w3 = self.services.get_port('WORKER3')
 
         # should we do something different here?????  a try block?
-        if(w1 is None or w2 is None or w3 is None):
+        if w1 is None or w2 is None or w3 is None:
             print('Error accessing physics components')
             raise Exception('Error accessing physics components')
 

tests/components/drivers/basic_serial2.py

@@ -29,7 +29,7 @@ def step(self, timestamp=0.0, **keywords):
         w3 = self.services.get_port('WORKER3')
 
         # should we do something different here?????  a try block?
-        if(w1 is None or w2 is None or w3 is None):
+        if w1 is None or w2 is None or w3 is None:
             print('Error accessing physics components')
             raise Exception('Error accessing physics components')