Skip to content
Snippets Groups Projects

Remove dummy

Merged Hugo Buddelmeijer requested to merge hb/feature/removedummy into develop
All threads resolved!

Apparently it is not necessary to use the dummy_* persistent properties anymore!

Edited by Willem-Jan Vriend

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • We could use this as a starting point to remove the dummy_* persistent attributes.

  • Should there be more done to remove the dummy attributes, or can I merge this?

  • This MR only removes the creation of the dummy_ attributes, see !355 (05922015) .

    However, there is still plenty of code that hides these attributes. rg dummy shows:

    src/micado/toolbox/python_from_vodml.py        
    373:                if not attr.name.startswith("dummy_")
                                                        
    src/micado/toolbox/tsf_from_python.py
    115:        if "dummy" not in a and a not in {"filename", "globalname", "object_id"}
                                                        
    src/micado/toolbox/rst_from_python.py
    106:        if a not in asbad and not a.startswith("dummy")
                                                                                                            
    src/micado/toolbox/python_from_tsf.py
    149:            "name": f"dummy_{name_template_eso.lower().replace('_', '')}",
    151:            "desc": "dummy",                    
                                                                                                            
    src/micado/test/functional/irdb_test.py                                                                 
    68:        if not a.startswith("dummy")                                                                 
    
    src/micado/main/TemplateExtra.py
    116:            if a not in asbad and not a.startswith("dummy")
    
    src/micado/main/MObjectExtra.py   
    308:            if not attrnamea.startswith("dummy")                                                    
    586:            if not a.startswith("dummy") and a not in attrs_to_ignore
    607:        attrnames = [a for a in self.get_persistent() if not a.startswith("dummy")]
                                                                                                            
    src/micado/main/MDBObjectMeta.py
    222:                    if not a.startswith("dummy_")
    687:            if not a.startswith("dummy") and a not in args_do                             
    955:            a for a in cls.get_persistent_properties() if not a.startswith("dummy_")
                                                        
    src/micado/main/HardwareExtra.py                                                                        
    80:            if not attrname.startswith("dummy")                                                      
                                                                                                            
    src/micado/main/RecipeStepExtra.py                                                                      
    174:            if pp not in names_bad and not pp.startswith("dummy")           
    
    src/micado/main/MObjectWISE.py
    16:    dummy_mobject = persistent("dummy_mobject", str, "")

    All that code can be removed.

  • Willem-Jan Vriend added 3 commits

    added 3 commits

    • f0e65d9c - removed dummy_xxx attributes
    • b6b67397 - removed dummy_xxx attributes
    • 0dd6cbeb - removed dummy_xxx attributes

    Compare with previous version

  • Willem-Jan Vriend marked this merge request as ready

    marked this merge request as ready

  • Willem-Jan Vriend enabled an automatic merge when the pipeline for 0dd6cbeb succeeds

    enabled an automatic merge when the pipeline for 0dd6cbeb succeeds

  • Willem-Jan Vriend aborted the automatic merge because source branch was updated

    aborted the automatic merge because source branch was updated

  • Willem-Jan Vriend added 3 commits

    added 3 commits

    Compare with previous version

    • Maintainer
      Resolved by CI Bot

      abstractautoformatter linting

      Some files are not formatted correctly according to abstractautoformatter:

      • src/micado/main/MObjectExtra.py
      • src/micado/main/TemplateExtra.py
      • src/micado/toolbox/python_from_tsf.py
      • src/micado/toolbox/rst_from_python.py

      The assist-MR !356 (merged) has been created to fix the formatting.

    • CI Bot Last reply by CI Bot
  • CI Bot mentioned in merge request !356 (merged)

    mentioned in merge request !356 (merged)

  • CI Bot resolved all threads

    resolved all threads

  • Willem-Jan Vriend enabled an automatic merge when the pipeline for 64ac876e succeeds

    enabled an automatic merge when the pipeline for 64ac876e succeeds

  • Willem-Jan Vriend aborted the automatic merge because source branch was updated

    aborted the automatic merge because source branch was updated

  • Willem-Jan Vriend added 2 commits

    added 2 commits

    • bdf3f14f - Auto-format files with abstractautoformatter
    • add16a01 - Merge branch 'assist/autoformat/hb/feature/removedummy/0dd6cbeb' into 'hb/feature/removedummy'

    Compare with previous version

  • CI Bot resolved all threads

    resolved all threads

    • Maintainer
      Resolved by CI Bot

      Passed

      Analysis Details

      0 Issues

      • Bug0 Bugs
      • Vulnerability0 Vulnerabilities
      • Code Smell0 Code Smells

      Coverage and Duplications

      • 0 percent coverage0.00% Coverage (0.00% Estimated after merge)
      • 3 percent duplication0.00% Duplicated Code (0.70% Estimated after merge)

      Project ID: micado-micadowise

      View in SonarQube

    • Please register or sign in to reply
  • CI Bot resolved all threads

    resolved all threads

  • Willem-Jan Vriend mentioned in commit 49eb0b17

    mentioned in commit 49eb0b17

Please register or sign in to reply