process-bigraph 0.0.30__tar.gz → 0.0.31__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. {process-bigraph-0.0.30/process_bigraph.egg-info → process-bigraph-0.0.31}/PKG-INFO +1 -1
  2. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/composite.py +6 -2
  3. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/process_types.py +2 -0
  4. {process-bigraph-0.0.30 → process-bigraph-0.0.31/process_bigraph.egg-info}/PKG-INFO +1 -1
  5. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/setup.py +1 -1
  6. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/.github/workflows/notebook_to_html.yml +0 -0
  7. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/.github/workflows/pytest.yml +0 -0
  8. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/.gitignore +0 -0
  9. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/AUTHORS.md +0 -0
  10. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/CLA.md +0 -0
  11. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/CODE_OF_CONDUCT.md +0 -0
  12. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/CONTRIBUTING.md +0 -0
  13. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/LICENSE +0 -0
  14. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/README.md +0 -0
  15. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/doc/_static/process-bigraph.png +0 -0
  16. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/notebooks/process-bigraphs.ipynb +0 -0
  17. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/notebooks/visualize_processes.ipynb +0 -0
  18. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/__init__.py +0 -0
  19. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/emitter.py +0 -0
  20. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/experiments/__init__.py +0 -0
  21. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/experiments/minimal_gillespie.py +0 -0
  22. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/processes/__init__.py +0 -0
  23. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/processes/growth_division.py +0 -0
  24. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/processes/parameter_scan.py +0 -0
  25. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/protocols.py +0 -0
  26. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/tests.py +0 -0
  27. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph.egg-info/SOURCES.txt +0 -0
  28. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph.egg-info/dependency_links.txt +0 -0
  29. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph.egg-info/requires.txt +0 -0
  30. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph.egg-info/top_level.txt +0 -0
  31. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/pytest.ini +0 -0
  32. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/release.sh +0 -0
  33. {process-bigraph-0.0.30 → process-bigraph-0.0.31}/setup.cfg +0 -0
{process-bigraph-0.0.30/process_bigraph.egg-info → process-bigraph-0.0.31}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: process-bigraph
3
- Version: 0.0.30
3
+ Version: 0.0.31
4
4
  Home-page: https://github.com/vivarium-collective/process-bigraph
5
5
  Author: Ryan Spangler, Eran Agmon
6
6
  Author-email: ryan.spangler@gmail.com, agmon.eran@gmail.com
{process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/composite.py RENAMED
@@ -450,10 +450,14 @@ class Composite(Process):
450
450
  raise Exception(
451
451
  f'initial state from edge does not match initial state from other edges:\n{path}\n{edge}\n{edge_state}')
452
452
 
453
- self.state = deep_merge(
454
- self.state,
453
+ self.merge(
454
+ self.composition,
455
455
  edge_state)
456
456
 
457
+ # self.state = deep_merge(
458
+ # self.state,
459
+ # edge_state)
460
+
457
461
  # TODO: call validate on this composite, not just check
458
462
  # assert self.core.validate(
459
463
  # self.composition,
{process-bigraph-0.0.30 → process-bigraph-0.0.31}/process_bigraph/process_types.py RENAMED
@@ -153,6 +153,8 @@ def deserialize_process(schema, encoded, core):
153
153
  core=core)
154
154
 
155
155
  deserialized['instance'] = process
156
+ else:
157
+ process = deserialized['instance']
156
158
 
157
159
  # TODO: this mutating the original value directly into
158
160
  # the return value is weird (?)
{process-bigraph-0.0.30 → process-bigraph-0.0.31/process_bigraph.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: process-bigraph
3
- Version: 0.0.30
3
+ Version: 0.0.31
4
4
  Home-page: https://github.com/vivarium-collective/process-bigraph
5
5
  Author: Ryan Spangler, Eran Agmon
6
6
  Author-email: ryan.spangler@gmail.com, agmon.eran@gmail.com
{process-bigraph-0.0.30 → process-bigraph-0.0.31}/setup.py RENAMED
@@ -2,7 +2,7 @@ import re
2
2
  from setuptools import setup, find_packages
3
3
 
4
4
 
5
- VERSION = '0.0.30'
5
+ VERSION = '0.0.31'
6
6
 
7
7
 
8
8
  with open("README.md", "r") as readme: