Skip to content

Commit dde7c9a

Browse files
eFraneeFrane
committed
Merge branch 'build_py' into m_master_build_py
 Conflicts: .gitignore schema/Person.json
2 parents 5f2978f + 9c4fa65 commit dde7c9a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2323
-403
lines changed

‎.gitignore

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
out/
22
archives/
3+
build/
34

4-
src/images/*.png
5-
src/3-99-generiertes-schema.md
6-
7-
composer.json
8-
composer.lock
9-
vendor/
10-
11-
*.komodoproject
12-
*.DS_Store
135
._*
146
.cache
7+
__pycache__
158

169
en/*-schema.md
1710
de/*-schema.md

‎.travis.yml

+22-3
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,37 @@ language: python
33

44
python:
55
- '3.5'
6+
- '3.6'
67

78
cache:
89
apt: true
910

1011
addons:
1112
apt:
1213
packages:
13-
- pandoc
14-
- lacheck
14+
- etoolbox
15+
- ghostscript
16+
- lmodern
1517
- graphviz
18+
- make
19+
- pandoc
20+
- pandoc-citeproc
21+
- texlive-fonts-recommended
22+
- texlive-generic-recommended
23+
- texlive-humanities
24+
- texlive-lang-german
25+
- texlive-latex-recommended
26+
- latex-xcolor
27+
- texlive-luatex
28+
- texlive-xetex
29+
- librsvg2-bin
30+
31+
install:
32+
- pip install pyaml
33+
# We use git describe which doesn't work on a shallow clone
34+
- git fetch --unshallow
1635

17-
script: make test
36+
script: ./build.py
1837

1938
notifications:
2039
slack:

‎.tx/config

+152
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
[main]
2+
host = https://www.transifex.com
3+
4+
[spec-1.0-00-metadatamd]
5+
source_lang = de
6+
source_file = src/0-00-metadata.md
7+
file_filter = locales/<lang>/src/0-00-metadata.md
8+
type = GITHUBMARKDOWN
9+
10+
[spec-1.1-00-einleitungmd]
11+
source_lang = de
12+
source_file = src/1-00-einleitung.md
13+
file_filter = locales/<lang>/src/1-00-einleitung.md
14+
type = GITHUBMARKDOWN
15+
16+
[spec-1.1-01-was-ist-oparlmd]
17+
source_lang = de
18+
source_file = src/1-01-was-ist-oparl.md
19+
file_filter = locales/<lang>/src/1-01-was-ist-oparl.md
20+
type = GITHUBMARKDOWN
21+
22+
[spec-1.1-02-zielsetzung-von-oparlmd]
23+
source_lang = de
24+
source_file = src/1-02-zielsetzung-von-oparl.md
25+
file_filter = locales/<lang>/src/1-02-zielsetzung-von-oparl.md
26+
type = GITHUBMARKDOWN
27+
28+
[spec-1.1-03-transparenz-und-beteiligung-durch-open-datamd]
29+
source_lang = de
30+
source_file = src/1-03-transparenz-und-beteiligung-durch-open-data.md
31+
file_filter = locales/<lang>/src/1-03-transparenz-und-beteiligung-durch-open-data.md
32+
type = GITHUBMARKDOWN
33+
34+
[spec-1.1-04-nutzungsszenarienmd]
35+
source_lang = de
36+
source_file = src/1-04-nutzungsszenarien.md
37+
file_filter = locales/<lang>/src/1-04-nutzungsszenarien.md
38+
type = GITHUBMARKDOWN
39+
40+
[spec-1.1-05-nomenklaturmd]
41+
source_lang = de
42+
source_file = src/1-05-nomenklatur.md
43+
file_filter = locales/<lang>/src/1-05-nomenklatur.md
44+
type = GITHUBMARKDOWN
45+
46+
[spec-1.1-06-datenschutzmd]
47+
source_lang = de
48+
source_file = src/1-06-datenschutz.md
49+
file_filter = locales/<lang>/src/1-06-datenschutz.md
50+
type = GITHUBMARKDOWN
51+
52+
[spec-1.1-07-oparl-governancemd]
53+
source_lang = de
54+
source_file = src/1-07-oparl-governance.md
55+
file_filter = locales/<lang>/src/1-07-oparl-governance.md
56+
type = GITHUBMARKDOWN
57+
58+
[spec-1.1-08-oparl-autorenmd]
59+
source_lang = de
60+
source_file = src/1-08-oparl-autoren.md
61+
file_filter = locales/<lang>/src/1-08-oparl-autoren.md
62+
type = GITHUBMARKDOWN
63+
64+
[spec-1.2-00-prinzipien-und-funktionen-der-schnittstellemd]
65+
source_lang = de
66+
source_file = src/2-00-prinzipien-und-funktionen-der-schnittstelle.md
67+
file_filter = locales/<lang>/src/2-00-prinzipien-und-funktionen-der-schnittstelle.md
68+
type = GITHUBMARKDOWN
69+
70+
[spec-1.2-01-designprinzipienmd]
71+
source_lang = de
72+
source_file = src/2-01-designprinzipien.md
73+
file_filter = locales/<lang>/src/2-01-designprinzipien.md
74+
type = GITHUBMARKDOWN
75+
76+
[spec-1.2-02-zukunftssicherheitmd]
77+
source_lang = de
78+
source_file = src/2-02-zukunftssicherheit.md
79+
file_filter = locales/<lang>/src/2-02-zukunftssicherheit.md
80+
type = GITHUBMARKDOWN
81+
82+
[spec-1.2-03-urlsmd]
83+
source_lang = de
84+
source_file = src/2-03-urls.md
85+
file_filter = locales/<lang>/src/2-03-urls.md
86+
type = GITHUBMARKDOWN
87+
88+
[spec-1.2-04-json-ausgabemd]
89+
source_lang = de
90+
source_file = src/2-04-json-ausgabe.md
91+
file_filter = locales/<lang>/src/2-04-json-ausgabe.md
92+
type = GITHUBMARKDOWN
93+
94+
[spec-1.2-05-objektlisten-und-paginierungmd]
95+
source_lang = de
96+
source_file = src/2-05-objektlisten-und-paginierung.md
97+
file_filter = locales/<lang>/src/2-05-objektlisten-und-paginierung.md
98+
type = GITHUBMARKDOWN
99+
100+
[spec-1.2-06-cross-origin-resource-sharing-corsmd]
101+
source_lang = de
102+
source_file = src/2-06-cross-origin-resource-sharing-cors.md
103+
file_filter = locales/<lang>/src/2-06-cross-origin-resource-sharing-cors.md
104+
type = GITHUBMARKDOWN
105+
106+
[spec-1.2-07-dateizugriffemd]
107+
source_lang = de
108+
source_file = src/2-07-dateizugriffe.md
109+
file_filter = locales/<lang>/src/2-07-dateizugriffe.md
110+
type = GITHUBMARKDOWN
111+
112+
[spec-1.2-08-geloeschte-objektemd]
113+
source_lang = de
114+
source_file = src/2-08-geloeschte-objekte.md
115+
file_filter = locales/<lang>/src/2-08-geloeschte-objekte.md
116+
type = GITHUBMARKDOWN
117+
118+
[spec-1.2-09-ausnahmebehandlungmd]
119+
source_lang = de
120+
source_file = src/2-09-ausnahmebehandlung.md
121+
file_filter = locales/<lang>/src/2-09-ausnahmebehandlung.md
122+
type = GITHUBMARKDOWN
123+
124+
[spec-1.2-10-endpunktmd]
125+
source_lang = de
126+
source_file = src/2-10-endpunkt.md
127+
file_filter = locales/<lang>/src/2-10-endpunkt.md
128+
type = GITHUBMARKDOWN
129+
130+
[spec-1.3-00-schemamd]
131+
source_lang = de
132+
source_file = src/3-00-schema.md
133+
file_filter = locales/<lang>/src/3-00-schema.md
134+
type = GITHUBMARKDOWN
135+
136+
[spec-1.3-01-eigenschaften-mit-verwendung-in-mehreren-objekttypenmd]
137+
source_lang = de
138+
source_file = src/3-01-eigenschaften-mit-verwendung-in-mehreren-objekttypen.md
139+
file_filter = locales/<lang>/src/3-01-eigenschaften-mit-verwendung-in-mehreren-objekttypen.md
140+
type = GITHUBMARKDOWN
141+
142+
[spec-1.buildingmd]
143+
source_lang = de
144+
source_file = building.md
145+
file_filter = building.<lang>.md
146+
type = GITHUBMARKDOWN
147+
148+
[spec-1.schema_stringsyml]
149+
source_lang = de
150+
source_file = schema/strings.yml
151+
file_filter = locales/<lang>/schema/strings.yml
152+
type = YML

‎Dockerfile

+18-10
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,13 @@
2222
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2323
# SOFTWARE.
2424

25-
FROM debian:latest
26-
MAINTAINER Stefan Graupner <[email protected]>
27-
28-
RUN apt update -y
29-
RUN apt upgrade -y
25+
FROM debian:testing-slim
3026

3127
# recommended packages for pandoc + basic pdf export
32-
RUN apt install --no-install-recommends -y \
33-
etoolbox \
28+
RUN apt update -y && apt upgrade -y && apt install --no-install-recommends -y \
3429
ghostscript \
3530
lmodern \
3631
graphviz \
37-
make \
3832
pandoc \
3933
pandoc-citeproc \
4034
texlive-fonts-recommended \
@@ -43,7 +37,21 @@ RUN apt install --no-install-recommends -y \
4337
texlive-lang-german \
4438
texlive-latex-recommended \
4539
texlive-luatex \
46-
texlive-xetex
40+
texlive-xetex \
41+
python3 \
42+
python3-pip \
43+
python3-setuptools \
44+
imagemagick \
45+
zip \
46+
tar \
47+
git-core \
48+
bzip2 && \
49+
pip3 install pyyaml && \
50+
apt remove -y --purge \
51+
python3-pip \
52+
python3-setuptools && \
53+
rm -rf /var/lib/apt/lists/* && \
54+
apt clean
4755

48-
RUN apt -y install python3 imagemagick zip tar bzip2
56+
ENTRYPOINT [ "python3", "build.py" ]
4957

‎LICENCE ‎LICENSE

File renamed without changes.

‎Makefile

-125
This file was deleted.

0 commit comments

Comments
 (0)