Skip to content

Commit

Permalink
Merge branch 'build_py' into m_master_build_py
Browse files Browse the repository at this point in the history
 Conflicts:
	.gitignore
	schema/Person.json
  • Loading branch information
eFrane committed Jan 3, 2018
2 parents 5f2978f + 9c4fa65 commit dde7c9a
Show file tree
Hide file tree
Showing 54 changed files with 2,323 additions and 403 deletions.
11 changes: 2 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
out/
archives/
build/

src/images/*.png
src/3-99-generiertes-schema.md

composer.json
composer.lock
vendor/

*.komodoproject
*.DS_Store
._*
.cache
__pycache__

en/*-schema.md
de/*-schema.md
Expand Down
25 changes: 22 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,37 @@ language: python

python:
- '3.5'
- '3.6'

cache:
apt: true

addons:
apt:
packages:
- pandoc
- lacheck
- etoolbox
- ghostscript
- lmodern
- graphviz
- make
- pandoc
- pandoc-citeproc
- texlive-fonts-recommended
- texlive-generic-recommended
- texlive-humanities
- texlive-lang-german
- texlive-latex-recommended
- latex-xcolor
- texlive-luatex
- texlive-xetex
- librsvg2-bin

install:
- pip install pyaml
# We use git describe which doesn't work on a shallow clone
- git fetch --unshallow

script: make test
script: ./build.py

notifications:
slack:
Expand Down
152 changes: 152 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
[main]
host = https://www.transifex.com

[spec-1.0-00-metadatamd]
source_lang = de
source_file = src/0-00-metadata.md
file_filter = locales/<lang>/src/0-00-metadata.md
type = GITHUBMARKDOWN

[spec-1.1-00-einleitungmd]
source_lang = de
source_file = src/1-00-einleitung.md
file_filter = locales/<lang>/src/1-00-einleitung.md
type = GITHUBMARKDOWN

[spec-1.1-01-was-ist-oparlmd]
source_lang = de
source_file = src/1-01-was-ist-oparl.md
file_filter = locales/<lang>/src/1-01-was-ist-oparl.md
type = GITHUBMARKDOWN

[spec-1.1-02-zielsetzung-von-oparlmd]
source_lang = de
source_file = src/1-02-zielsetzung-von-oparl.md
file_filter = locales/<lang>/src/1-02-zielsetzung-von-oparl.md
type = GITHUBMARKDOWN

[spec-1.1-03-transparenz-und-beteiligung-durch-open-datamd]
source_lang = de
source_file = src/1-03-transparenz-und-beteiligung-durch-open-data.md
file_filter = locales/<lang>/src/1-03-transparenz-und-beteiligung-durch-open-data.md
type = GITHUBMARKDOWN

[spec-1.1-04-nutzungsszenarienmd]
source_lang = de
source_file = src/1-04-nutzungsszenarien.md
file_filter = locales/<lang>/src/1-04-nutzungsszenarien.md
type = GITHUBMARKDOWN

[spec-1.1-05-nomenklaturmd]
source_lang = de
source_file = src/1-05-nomenklatur.md
file_filter = locales/<lang>/src/1-05-nomenklatur.md
type = GITHUBMARKDOWN

[spec-1.1-06-datenschutzmd]
source_lang = de
source_file = src/1-06-datenschutz.md
file_filter = locales/<lang>/src/1-06-datenschutz.md
type = GITHUBMARKDOWN

[spec-1.1-07-oparl-governancemd]
source_lang = de
source_file = src/1-07-oparl-governance.md
file_filter = locales/<lang>/src/1-07-oparl-governance.md
type = GITHUBMARKDOWN

[spec-1.1-08-oparl-autorenmd]
source_lang = de
source_file = src/1-08-oparl-autoren.md
file_filter = locales/<lang>/src/1-08-oparl-autoren.md
type = GITHUBMARKDOWN

[spec-1.2-00-prinzipien-und-funktionen-der-schnittstellemd]
source_lang = de
source_file = src/2-00-prinzipien-und-funktionen-der-schnittstelle.md
file_filter = locales/<lang>/src/2-00-prinzipien-und-funktionen-der-schnittstelle.md
type = GITHUBMARKDOWN

[spec-1.2-01-designprinzipienmd]
source_lang = de
source_file = src/2-01-designprinzipien.md
file_filter = locales/<lang>/src/2-01-designprinzipien.md
type = GITHUBMARKDOWN

[spec-1.2-02-zukunftssicherheitmd]
source_lang = de
source_file = src/2-02-zukunftssicherheit.md
file_filter = locales/<lang>/src/2-02-zukunftssicherheit.md
type = GITHUBMARKDOWN

[spec-1.2-03-urlsmd]
source_lang = de
source_file = src/2-03-urls.md
file_filter = locales/<lang>/src/2-03-urls.md
type = GITHUBMARKDOWN

[spec-1.2-04-json-ausgabemd]
source_lang = de
source_file = src/2-04-json-ausgabe.md
file_filter = locales/<lang>/src/2-04-json-ausgabe.md
type = GITHUBMARKDOWN

[spec-1.2-05-objektlisten-und-paginierungmd]
source_lang = de
source_file = src/2-05-objektlisten-und-paginierung.md
file_filter = locales/<lang>/src/2-05-objektlisten-und-paginierung.md
type = GITHUBMARKDOWN

[spec-1.2-06-cross-origin-resource-sharing-corsmd]
source_lang = de
source_file = src/2-06-cross-origin-resource-sharing-cors.md
file_filter = locales/<lang>/src/2-06-cross-origin-resource-sharing-cors.md
type = GITHUBMARKDOWN

[spec-1.2-07-dateizugriffemd]
source_lang = de
source_file = src/2-07-dateizugriffe.md
file_filter = locales/<lang>/src/2-07-dateizugriffe.md
type = GITHUBMARKDOWN

[spec-1.2-08-geloeschte-objektemd]
source_lang = de
source_file = src/2-08-geloeschte-objekte.md
file_filter = locales/<lang>/src/2-08-geloeschte-objekte.md
type = GITHUBMARKDOWN

[spec-1.2-09-ausnahmebehandlungmd]
source_lang = de
source_file = src/2-09-ausnahmebehandlung.md
file_filter = locales/<lang>/src/2-09-ausnahmebehandlung.md
type = GITHUBMARKDOWN

[spec-1.2-10-endpunktmd]
source_lang = de
source_file = src/2-10-endpunkt.md
file_filter = locales/<lang>/src/2-10-endpunkt.md
type = GITHUBMARKDOWN

[spec-1.3-00-schemamd]
source_lang = de
source_file = src/3-00-schema.md
file_filter = locales/<lang>/src/3-00-schema.md
type = GITHUBMARKDOWN

[spec-1.3-01-eigenschaften-mit-verwendung-in-mehreren-objekttypenmd]
source_lang = de
source_file = src/3-01-eigenschaften-mit-verwendung-in-mehreren-objekttypen.md
file_filter = locales/<lang>/src/3-01-eigenschaften-mit-verwendung-in-mehreren-objekttypen.md
type = GITHUBMARKDOWN

[spec-1.buildingmd]
source_lang = de
source_file = building.md
file_filter = building.<lang>.md
type = GITHUBMARKDOWN

[spec-1.schema_stringsyml]
source_lang = de
source_file = schema/strings.yml
file_filter = locales/<lang>/schema/strings.yml
type = YML
28 changes: 18 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,13 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

FROM debian:latest
MAINTAINER Stefan Graupner <[email protected]>

RUN apt update -y
RUN apt upgrade -y
FROM debian:testing-slim

# recommended packages for pandoc + basic pdf export
RUN apt install --no-install-recommends -y \
etoolbox \
RUN apt update -y && apt upgrade -y && apt install --no-install-recommends -y \
ghostscript \
lmodern \
graphviz \
make \
pandoc \
pandoc-citeproc \
texlive-fonts-recommended \
Expand All @@ -43,7 +37,21 @@ RUN apt install --no-install-recommends -y \
texlive-lang-german \
texlive-latex-recommended \
texlive-luatex \
texlive-xetex
texlive-xetex \
python3 \
python3-pip \
python3-setuptools \
imagemagick \
zip \
tar \
git-core \
bzip2 && \
pip3 install pyyaml && \
apt remove -y --purge \
python3-pip \
python3-setuptools && \
rm -rf /var/lib/apt/lists/* && \
apt clean

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

File renamed without changes.
125 changes: 0 additions & 125 deletions Makefile

This file was deleted.

Loading

0 comments on commit dde7c9a

Please sign in to comment.