Skip to content
Snippets Groups Projects
Commit b93e541d authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

fix conflicts

parents 378fb8e2 81369a2f
No related branches found
No related tags found
2 merge requests!183create new experimental release,!182Removed argparse dependency
Pipeline #19192 passed with stage
Stage:
    in 40 minutes and 9 seconds
    Hide whitespace changes
    Inline Side-by-side
    packages/py-snudda/package.py
    + 1
    − 1
    View file @ b93e541d
    ......@@ -7,7 +7,7 @@ class PySnudda(Package):
    maintainers = ['hjorth','akarmas']
    version('1.3.0', 'a9d56c3aed6771b3b1af82543f70834f', expand=False)
    version('1.3.1', '1460fb79ad7fc08097d5f729c4a72388', expand=False)
    depends_on('python@3.8:', type=('build','run'))
    depends_on('py-pip', type='build')
    ......
    spack.yaml
    + 1
    − 1
    View file @ b93e541d
    ......@@ -60,7 +60,7 @@ spack:
    - py-lfpy@2.2.6
    - py-elephant
    - py-frites
    # - py-snudda
    - py-snudda
    - biobb-common
    - biobb-gromacs
    - apbs
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment