Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change docker interface to newer docker image #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change docker interface to newer docker image #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
.pytest_cache/

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down Expand Up @@ -93,3 +94,4 @@ ENV/
.*.swp
.*.swo

docker/adus*
4 changes: 2 additions & 2 deletions elsepa/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@


def elscata(settings: Settings):
with DockerContainer('elsepa', working_dir='/opt/elsepa') as elsepa:
with DockerContainer('elsepa', working_dir='/root') as elsepa:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we merge the no-docker branch into master (I think there is no reason not to do this), this change becomes irrelevant.

elsepa.put_archive(
Archive('w')
.add_text_file('input.dat', generate_elscata_input(settings))
.close())

elsepa.sh('./elscata < input.dat',
elsepa.sh('elscata < input.dat',
'mkdir result && mv *.dat result')

result_tar = elsepa.get_archive('result')
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
'Programming Language :: Python :: 3',
'Topic :: Scientific/Engineering :: Physics'],
install_requires=[
'pint==0.8.1', 'numpy==1.13.0', 'docker==2.4.0', 'cslib', 'noodles[prov,numpy]==0.2.3'],
'pint==0.8.1', 'numpy==1.13.0', 'docker==2.4.0', 'cslib', 'noodles'],
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We deliberately pin version numbers for all packages. We have seen some developers introduce breaking API changes in minor updates (e.g. between an 1.1.0 and 1.1.1 release). We have also seen regressions introduced.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very wise, then for the moment you should pin noodles to 0.3

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems that's not in pip yet. Nothing is broken at the moment (just weird output on windows), so we'll wait for the "proper" release. The installation procedure is horrible enough as it is :)

extras_require={
'test': ['pytest']
},
Expand Down