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.

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

[WIP] Update project structure #225

Merged
merged 7 commits into from
Feb 1, 2018
Merged

[WIP] Update project structure #225

merged 7 commits into from
Feb 1, 2018

Conversation

mimischi
Copy link
Collaborator

@mimischi mimischi commented Dec 30, 2017

Replaces the other PR #173, as we got stuck there with some migrations.

Changelog

  • Get rid of requirements.txt and use pipenv instead.
  • Delete old unused files and folders.
  • Update to new usage of Docker containers.
    • docker-compose now uses the default docker-compose.yml for local development.
    • Deployment to Dokku is now managed through ./docker/dokku/Dockerfile.
  • Updated to django==2. Adapted breaking changes.

Checklist

  • Tests pass
  • Deploy to Dokku works
  • Updated README.md
  • Updated Wiki

@mimischi mimischi force-pushed the projectlayout branch 3 times, most recently from 8a80a24 to 6f79707 Compare December 30, 2017 17:49
@mimischi mimischi changed the title [WIP] Update project structure@ [WIP] Update project structure Dec 30, 2017
@codecov-io
Copy link

codecov-io commented Dec 30, 2017

Codecov Report

Merging #225 into develop will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #225   +/-   ##
========================================
  Coverage    81.04%   81.04%           
========================================
  Files           12       12           
  Lines          517      517           
========================================
  Hits           419      419           
  Misses          98       98
Impacted Files Coverage Δ
geomat/stein/models.py 95.19% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b9bca8d...1798973. Read the comment docs.

@mimischi mimischi mentioned this pull request Dec 30, 2017
5 tasks
@mimischi mimischi force-pushed the projectlayout branch 3 times, most recently from ffdc126 to 1798973 Compare January 1, 2018 15:10
@chgad
Copy link
Member

chgad commented Jan 6, 2018

In my opinion there is only 1 Wiki entry to update, where still -f dev.yml is in one of the commands.

mimischi and others added 7 commits February 1, 2018 17:53
* Delete files that will be replaced by new ones.
* Get rid of `requirements.txt` and use `Pipfile` instead.
* Delete old unused files.
* New development process with `docker-compose`.
* New deploy via `Dockerfile` to Dokku.
* Update all settings accordingly.
Used a simple `sed` command for it:

```
$ cd geomat/stein/migrations
$ sed -i "s/b'/'/g" *.py
```
@chgad chgad merged commit 6620660 into develop Feb 1, 2018
@chgad chgad deleted the projectlayout branch March 13, 2018 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants