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

Jump to bottom

clean up of buildout and docker #14

Merged
merged 2 commits into from
Feb 28, 2018
Merged

clean up of buildout and docker #14

merged 2 commits into from
Feb 28, 2018

Conversation

cehbrecht
Copy link
Member

@cehbrecht cehbrecht commented Feb 27, 2018 •
edited
Loading

Description

  • using just one buildout.cfg config file ... removed the profile/ directiory
  • updated and simplified the Dockerfile and docker-compose.yml
  • cleaned up conda environment and Python requirements

@cehbrecht
Squashed commit of the following:
cd5a28b 
commit 693d619
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 15:17:30 2018 +0100

    update authors

commit 7e094de
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 15:05:34 2018 +0100

    added example with docker exec

commit a0c9d31
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 15:05:22 2018 +0100

    added build

commit bcbd41a
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 14:30:41 2018 +0100

    fixed port in docker tutorial

commit 19a401c
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 14:30:24 2018 +0100

    fixed doc

commit 195466c
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 14:03:56 2018 +0100

    simplified docker config

commit bae7588
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:40:21 2018 +0100

    removed docker targets

commit 7f99588
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:40:07 2018 +0100

    added buildout .docker.cfg

commit 110829d
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:22:36 2018 +0100

    removed docker.cfg

commit 52a6237
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:20:58 2018 +0100

    using only buildout.cfg

commit 96ff9b8
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:13:04 2018 +0100

    only use base.cfg

commit 2bd42d2
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 12:54:56 2018 +0100

    moved devel options to custom.cfg

commit 468b266
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 12:52:09 2018 +0100

    update travis

commit 2607745
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 11:31:28 2018 +0100

    update versions.cfg

commit 659e944
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:30:26 2018 +0100

    cleaned up development.cfg

commit 5e2c171
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:30:07 2018 +0100

    removed debug.cfg

commit 05be2ec
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:27:36 2018 +0100

    update versions.cfg

commit 8d8043d
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:27:16 2018 +0100

    removed sphinx recipe

commit 8b88557
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:19:52 2018 +0100

    remove unused centos.cfg and debian.cfg

commit e7e63b3
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:16:55 2018 +0100

    update versions.cfg

commit cca819e
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:16:15 2018 +0100

    removed ipython

commit 90f2034
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:08:10 2018 +0100

    cleaned up conda env ... removed ipython

commit bb66dd8
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:00:53 2018 +0100

    removed requirements.sh ... not needed here

commit 1d0713b
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:59:18 2018 +0100

    fixed requirements

commit 9a10d73
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:57:08 2018 +0100

    removed reqirements rtd.txt

commit 0374be8
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:56:52 2018 +0100

    added sphinx

commit a7a15d0
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:56:06 2018 +0100

    using requirements_dev.txt

commit 48848e3
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:55:33 2018 +0100

    using requirements.txt

commit c2b2f72
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:54:27 2018 +0100

    removed conda_pinned
@cehbrecht cehbrecht self-assigned this Feb 27, 2018
cehbrecht
cehbrecht commented Feb 27, 2018
View reviewed changes
Copy link
Member Author

@cehbrecht cehbrecht left a comment

Choose a reason for hiding this comment

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

tested with pingudev branch locally and on travis.

@cehbrecht
Copy link
Member Author

This PR fixes issue #13 to clean up and simplify buildout and docker configuration.

@cehbrecht cehbrecht requested a review from huard February 27, 2018 14:39
@cehbrecht
Copy link
Member Author

@huard
trust me :) Just a short view on this PR is sufficient ... if things go wrong I will fix it.

I can update the cookiecutter accordingly to the cleaned up Emu.

@cehbrecht cehbrecht added this to the 0.7.0 milestone Feb 27, 2018
@cehbrecht
Squashed commit of the following:
9108f4c 
commit 86369ff
Author: Carsten Ehbrecht <[email protected]>
Date:   Wed Feb 28 16:37:42 2018 +0100

    use sphinx via buildout setup

commit f2d03d0
Author: Carsten Ehbrecht <[email protected]>
Date:   Wed Feb 28 13:02:16 2018 +0100

    update makefile

commit 693d619
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 15:17:30 2018 +0100

    update authors

commit 7e094de
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 15:05:34 2018 +0100

    added example with docker exec

commit a0c9d31
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 15:05:22 2018 +0100

    added build

commit bcbd41a
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 14:30:41 2018 +0100

    fixed port in docker tutorial

commit 19a401c
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 14:30:24 2018 +0100

    fixed doc

commit 195466c
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 14:03:56 2018 +0100

    simplified docker config

commit bae7588
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:40:21 2018 +0100

    removed docker targets

commit 7f99588
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:40:07 2018 +0100

    added buildout .docker.cfg

commit 110829d
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:22:36 2018 +0100

    removed docker.cfg

commit 52a6237
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:20:58 2018 +0100

    using only buildout.cfg

commit 96ff9b8
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 13:13:04 2018 +0100

    only use base.cfg

commit 2bd42d2
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 12:54:56 2018 +0100

    moved devel options to custom.cfg

commit 468b266
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 12:52:09 2018 +0100

    update travis

commit 2607745
Author: Carsten Ehbrecht <[email protected]>
Date:   Tue Feb 27 11:31:28 2018 +0100

    update versions.cfg

commit 659e944
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:30:26 2018 +0100

    cleaned up development.cfg

commit 5e2c171
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:30:07 2018 +0100

    removed debug.cfg

commit 05be2ec
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:27:36 2018 +0100

    update versions.cfg

commit 8d8043d
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:27:16 2018 +0100

    removed sphinx recipe

commit 8b88557
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:19:52 2018 +0100

    remove unused centos.cfg and debian.cfg

commit e7e63b3
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:16:55 2018 +0100

    update versions.cfg

commit cca819e
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:16:15 2018 +0100

    removed ipython

commit 90f2034
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:08:10 2018 +0100

    cleaned up conda env ... removed ipython

commit bb66dd8
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 17:00:53 2018 +0100

    removed requirements.sh ... not needed here

commit 1d0713b
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:59:18 2018 +0100

    fixed requirements

commit 9a10d73
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:57:08 2018 +0100

    removed reqirements rtd.txt

commit 0374be8
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:56:52 2018 +0100

    added sphinx

commit a7a15d0
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:56:06 2018 +0100

    using requirements_dev.txt

commit 48848e3
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:55:33 2018 +0100

    using requirements.txt

commit c2b2f72
Author: Carsten Ehbrecht <[email protected]>
Date:   Mon Feb 26 16:54:27 2018 +0100

    removed conda_pinned
@cehbrecht
Copy link
Member Author

updated PR with sphinx section in buildout.cfg ... still needed to run make docs.

@cehbrecht
Copy link
Member Author

merged.

@cehbrecht cehbrecht closed this Feb 28, 2018
@cehbrecht cehbrecht reopened this Feb 28, 2018
@cehbrecht cehbrecht merged commit 52735f0 into master Feb 28, 2018
@cehbrecht cehbrecht mentioned this pull request Feb 28, 2018
Closed
@cehbrecht cehbrecht deleted the issue-13-clean-up branch April 26, 2018 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@huard huard huard approved these changes

Assignees

@cehbrecht cehbrecht

Labels
enhancement
Projects
None yet
Milestone
0.7.0
Development

Successfully merging this pull request may close these issues.
2 participants
@cehbrecht @huard