Commit f79cd780 authored by Maximilian Sprengholz's avatar Maximilian Sprengholz 😵
Browse files

Bump to Version 1.2.0

parent 543da69f
Pipeline #14876 failed with stages
in 28 seconds
......@@ -26,10 +26,10 @@ gen_docs:
- git config --global user.email "${GITLAB_USER_EMAIL}"
- git add docs/appendix.md
- git add docs/appendix.html
- git commit -m "[ci skip] Built docs ${CI_COMMIT_TAG}" || echo "Nothing to commit."
- git commit -m "Document build ${CI_COMMIT_TAG} [ci skip]" || echo "Nothing to commit."
- git push http://${GITLAB_USER_LOGIN}:${TOKEN}@scm.cms.hu-berlin.de/${CI_PROJECT_PATH} HEAD:${CI_COMMIT_REF_NAME}
only:
- master
- tags
pages:
stage: deploy
......@@ -47,4 +47,4 @@ pages:
- public
expire_in: 15 mins
only:
- master
- tags
# Open materials: 'From "guestworkers" to EU migrants: A gendered view on the labor market integration of different arrival cohorts in Germany'
_Version 1.2.0_
Open materials for the paper 'From "guestworkers" to EU migrants: A gendered view on the labor market integration of different arrival cohorts in Germany' by
[Maximilian Sprengholz](mailto:maximilian.sprengholz@hu-berlin.de), [Claudia Diehl](mailto:claudia.diehl@uni-konstanz.de), [Johannes Giesecke](johannes.giesecke@hu-berlin.de) and [Michaela Kreyenfeld](Kreyenfeld@hertie-school.org).
See [online appendix](http://pages.cms.hu-berlin.de/sprenmax/a-long-view/).
__See [online appendix](http://pages.cms.hu-berlin.de/sprenmax/a-long-view/).__
## Project organization
......@@ -20,7 +18,8 @@ See [online appendix](http://pages.cms.hu-berlin.de/sprenmax/a-long-view/).
│ ├── processed <- The final data set
│ ├── raw <- The original, immutable data dump
│ └── temp <- Intermediate data that has been transformed
├── docs <- Documentation (.md, building dependencies)
├── docs <- Documentation (.md -> .html, Makefile and Dockerfile)
│ └── dep <- Dependencies for the .html generation
├── public <- Published appendix (as page for repo)
├── results
│ ├── figures <- Figures for the manuscript / appendix
......@@ -28,7 +27,7 @@ See [online appendix](http://pages.cms.hu-berlin.de/sprenmax/a-long-view/).
└── src <- Source code (.do)
```
Repository organization implemented with [cookiecutter](https://github.com/cookiecutter/cookiecutter) using the [good-enough-project template](good-enough-project).
Repository organization implemented with [cookiecutter](https://github.com/cookiecutter/cookiecutter) using an adapted version of the [good-enough-project template](good-enough-project).
## Data
The main data used in this project are the Scientific Use Files (SUFs) 1976-2015 of the German Microsensus
......@@ -45,19 +44,38 @@ The following user-written programs need to be installed in order to run the ful
- [grstyle](http://repec.sowi.unibe.ch/stata/grstyle/index.html). Jann, B. (2018) ‘Customizing Stata Graphs Made Easy (Part 1)’, The Stata Journal: Promoting communications on statistics and Stata, 18, 491–502.
- [tabout v3](http://tabout.net.au/). Watson, I. (2019).
Further external code used:
Further external code used (part of the do-files, no installation necessary):
- [isei_mz_96-04.do](https://www.gesis.org/missy/files/documents/MZ/isei/isei_mz_96-04.do). Kogan, I. and Schimpl-Neimanns, B. (2006) Recodierung von ISEI auf Basis von ISCO-88 (COM). German Microdata Lab (GML), Mannheim
- [Programme zur Umsetzung der Bildungsklassifikation ISCED-1997](https://www.gesis.org/missy/materials/MZ/tools/isced), German Microdata Lab (GML), Mannheim. Used for years 1976-2013, source files under `bin/external`.
The online [appendix/documentation](http://pages.cms.hu-berlin.de/sprenmax/a-long-view/) was created in [Atom](https://github.com/atom/atom) with [Markdown Preview Enhanced](https://github.com/shd101wyy/markdown-preview-enhanced), [Pandoc](https://github.com/jgm/pandoc) and [pandoc-crossref](https://github.com/lierdakil/pandoc-crossref).
## Documentation
The [online appendix](http://pages.cms.hu-berlin.de/sprenmax/a-long-view/) presents the results of our main as well as supplementary estimations. The file `docs/appendix.html` represents a copy of this page. In case you want to re-generate `docs/appendix.html` from `docs/appendix.md`, please use the provided `Makefile`. To run it, you need to have [Docker](https://www.docker.com/) installed (and Windows users also [Make](https://www.gnu.org/software/make/)):
```sh
cd path/to/a-long-view/docs
make all
```
The Docker image that is pulled in the process already contains all the necessary depencies. Alternatively, you can also do it manually given [Pandoc](https://github.com/jgm/pandoc), [pandoc-crossref](https://github.com/lierdakil/pandoc-crossref), and [pandoc-include](https://pypi.org/project/pandoc-include/) (which requires Python) are installed:
```sh
cd path/to/a-long-view/docs
# Call Pandoc
pandoc --filter pandoc-include --filter pandoc-crossref --citeproc \
--bibliography=dep/appendix.bib --csl=dep/journal-of-family-research.csl \
--number-sections --table-of-contents -c dep/empty.css -H dep/vue_extended_h.css \
appendix.md -H dep/lightbox.js -s -o appendix.html
```
Note that the version is not updated in either of these ways, as it is determined by git via a pipeline job and not available locally. The date is set to the current date when using the `Makefile`.
## License
This project is licensed under the terms of the [MIT License](/LICENSE.md)
## Citation
Please cite this software as:
......
FROM kenose/pandoc-python:latest
LABEL maintainer="Maximilian Sprengholz <maximilian.sprengholz@hu-berlin.de>"
# create dir and copy files
RUN mkdir -p /repo_clone && mkdir -p /repo_clone/results && mkdir -p /repo_clone/docs
COPY results repo_clone/results
COPY appendix.md repo_clone/docs/
COPY dep repo_clone/docs/dep
WORKDIR repo_clone/docs/
# Versioning is done via git, but the date can be manually updated here
RUN export DATE=$(date '+%y-%m-%d') \
&& python dep/regexrep.py 'appendix.md' '(date:[\s])(.*)' '\1"' ${DATE} '"'
# Call Pandoc
RUN pandoc --filter pandoc-include --filter pandoc-crossref --citeproc \
--bibliography=dep/appendix.bib --csl=dep/journal-of-family-research.csl \
--number-sections --table-of-contents -c dep/empty.css -H dep/vue_extended_h.css \
appendix.md -H dep/lightbox.js -s -o appendix.html
# (1) Copy from the results dir into docs to make files available to docker
# (2) Build document
# (3) Clean up files
.PHONY: copy build cleanup
copy:
cp -R -f ../results .
rm -f appendix.html # fix overwriting bug
build:
docker build -t docs .
docker rm -f docs || true # remove if already built and present
docker create -t --name docs docs
docker cp docs:/build/repo_clone/docs/appendix.html appendix.html
docker stop docs
docker rm -f docs
cleanup:
rm -rf results
all: copy build cleanup
......@@ -4,7 +4,6 @@
<meta charset="utf-8" />
<meta name="generator" content="pandoc" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
<meta name="dcterms.date" content="2020-12-23" />
<title>Online Appendix: From “guestworkers” to EU migrants: A gendered view on the labor market integration of different arrival cohorts in Germany</title>
<style>
code{white-space: pre-wrap;}
......@@ -2362,7 +2361,7 @@
<header id="title-block-header">
<h1 class="title">Online Appendix: From “guestworkers” to EU migrants: A gendered view on the labor market integration of different arrival cohorts in Germany</h1>
<p class="subtitle">Version <b></b></p>
<p class="date">2020-12-23</p>
<p class="date">20-12-23</p>
</header>
<nav id="TOC" role="doc-toc">
<ul>
......@@ -6089,8 +6088,7 @@ Total (n=3,801,564)
Corresponds to analysis sample except for arrival year restrictions. Shares for persons with non-German citizenship who were born abroad. <br /> Source: Microcensus Scientific Use Files, DOI: <a href="https://doi.org/10.21242/12211.1976.00.00.3.1.0">10.21242/12211.1976.00.00.3.1.0</a> to <a href="https://doi.org/10.21242/12211.2015.00.00.3.1.0">10.21242/12211.2015.00.00.3.1.0</a>, own calculations.
</p>
</div>
<p>Since 2005, the immigration year question is part of the mandatory questionnaire. The lower non-response rates mean overall higher observation numbers. Table 8 shows that the relative size of cohorts in percent increased to a similar extent at this cut-off. So, probably no selection on the cohort (selection on other characteristics still possible, of course). The changes for cohorts 1964-73 and 1994-2003 are due the age range of 25-54, shares are even closer across years without this restriction. @</p>
<p>test <span class="citation" data-cites="import">(<strong>import?</strong>)</span></p>
<p>Since 2005, the immigration year question is part of the mandatory questionnaire. The lower non-response rates mean overall higher observation numbers. Table 8 shows that the relative size of cohorts in percent increased to a similar extent at this cut-off. So, probably no selection on the cohort (selection on other characteristics still possible, of course). The changes for cohorts 1964-73 and 1994-2003 are due the age range of 25-54, shares are even closer across years without this restriction.</p>
<div class="tabledetails">
<div id="tbl:sum_cohort_sel_nonres_2004-2006">
......
......@@ -148,9 +148,7 @@ Source: Microcensus Scientific Use Files, DOI: <a href="https://doi.org/10.21242
</p>
</div>
Since 2005, the immigration year question is part of the mandatory questionnaire. The lower non-response rates mean overall higher observation numbers. [@Tbl:sum_cohort_sel_nonres_2004-2006] shows that the relative size of cohorts in percent increased to a similar extent at this cut-off. So, probably no selection on the cohort (selection on other characteristics still possible, of course). The changes for cohorts 1964-73 and 1994-2003 are due the age range of 25-54, shares are even closer across years without this restriction. @
test @import
Since 2005, the immigration year question is part of the mandatory questionnaire. The lower non-response rates mean overall higher observation numbers. [@Tbl:sum_cohort_sel_nonres_2004-2006] shows that the relative size of cohorts in percent increased to a similar extent at this cut-off. So, probably no selection on the cohort (selection on other characteristics still possible, of course). The changes for cohorts 1964-73 and 1994-2003 are due the age range of 25-54, shares are even closer across years without this restriction.
!include ../results/output/sum_cohort_sel_nonres_2004-2006.md
......
#python dep/regexrep.py 'appendix.md' '(subtitle:[\s])(.*)' '\1"Version <b>${CI_COMMIT_TAG}</b>"'
export DATE=$(date '+%y-%m-%d')
python dep/regexrep.py 'appendix.md' '(date:[\s])(.*)' '\1"' ${DATE} '"'
# pandoc call
#pandoc --filter pandoc-include --filter pandoc-crossref --citeproc --bibliography=appendix.bib --csl=journal-of-family-research.csl --number-sections --table-of-contents -c ../public/css/vue_extended.css appendix.md -s -o test.html
Markdown is supported
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