Skip to content
This repository has been archived by the owner on Sep 28, 2020. It is now read-only.

Make most setup script flags work #473

Merged
merged 7 commits into from
Dec 7, 2017
Merged

Make most setup script flags work #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
828a2bc
Update configs and setup to support load_development_data
jisantuc Oct 19, 2017
9c20983
Update translation file handling in setup scripts
jisantuc Oct 19, 2017
676b385
Filter language management command to enabled languages
jisantuc Oct 19, 2017
34e459c
Make templates setup flag work
jisantuc Oct 19, 2017
0bb926a
Remove manual transaction management
jisantuc Oct 19, 2017
e8bc649
Don't run migrations in update
jisantuc Oct 20, 2017
6c14516
Cleanup
jisantuc Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions django/publicmapping/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

COPY requirements.txt /usr/src/app/
RUN apt-get update && apt-get install -y git gcc
RUN apt-get update && apt-get install -y \
git gcc wget unzip
RUN pip install --no-cache-dir -r requirements.txt

COPY . /usr/src/app

WORKDIR /usr/src/app

RUN cp config/config.dist.xml config/config.xml \
&& python setup.py ./config/config.xsd ./config/config.xml -v2 -d
RUN cp config/config.dist.xml config/config.xml

ENTRYPOINT ["/usr/local/bin/gunicorn"]
16 changes: 8 additions & 8 deletions django/publicmapping/config/config.dist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@

-->

<Shapefile path="/projects/PublicMapping/local/data/tl_2010_51_block10_3785_join.shp">
<Shapefile path="/data/tl_2010_51_block10_3785_join.shp">
<Fields>
<!--

Expand Down Expand Up @@ -1079,7 +1079,7 @@

-->
<Files>
<Geography path="/projects/PublicMapping/local/data/tl_2010_51_vtd10_3785.shp">
<Geography path="/data/tl_2010_51_vtd10_3785.shp">
<!--

Each Field item defines a field in the shapefile that
Expand Down Expand Up @@ -1133,7 +1133,7 @@

-->
<Files>
<Geography path="/projects/PublicMapping/local/data/tl_2010_51_county10_3785.shp">
<Geography path="/data/tl_2010_51_county10_3785.shp">
<!--

Each Field item defines a field in the shapefile that
Expand Down Expand Up @@ -1185,19 +1185,19 @@
unit of geography, and 2) the district it belongs to.

-->
<Blockfile path="/projects/PublicMapping/local/data/cd111_index.csv" />
<Blockfile path="/data/cd111_index.csv" />
</Template>

<Template name="State House">
<LegislativeBody ref="house"/>

<Blockfile path="/projects/PublicMapping/local/data/sldl10_index.csv" />
<Blockfile path="/data/sldl10_index.csv" />
</Template>

<Template name="State Senate">
<LegislativeBody ref="senate"/>

<Blockfile path="/projects/PublicMapping/local/data/sldu10_index.csv" />
<Blockfile path="/data/sldu10_index.csv" />
</Template>
</Templates>

Expand Down Expand Up @@ -1324,7 +1324,7 @@
<BardConfigs>
<BardConfig
id="tenpercent"
shape="/projects/PublicMapping/local/data/vablock_bard_save.Rdata"
shape="/data/vablock_bard_save.Rdata"
temp="/projects/PublicMapping/local/reports"
transform="/projects/PublicMapping/DistrictBuilder/docs/bard_template.xslt">
<PopVars>
Expand Down Expand Up @@ -1357,7 +1357,7 @@
</BardConfig>
<BardConfig
id="fivepercent"
shape="/projects/PublicMapping/local/data/vablock_bard_save.Rdata"
shape="/data/vablock_bard_save.Rdata"
temp="/projects/PublicMapping/local/reports"
transform="/projects/PublicMapping/DistrictBuilder/docs/bard_template.xslt">
<PopVars>
Expand Down
16 changes: 8 additions & 8 deletions django/publicmapping/config/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@

-->

<Shapefile path="/projects/PublicMapping/local/data/tl_2010_51_block10_3785_join.shp">
<Shapefile path="/data/tl_2010_51_block10_3785_join.shp">
<Fields>
<!--

Expand Down Expand Up @@ -1079,7 +1079,7 @@

-->
<Files>
<Geography path="/projects/PublicMapping/local/data/tl_2010_51_vtd10_3785.shp">
<Geography path="/data/tl_2010_51_vtd10_3785.shp">
<!--

Each Field item defines a field in the shapefile that
Expand Down Expand Up @@ -1133,7 +1133,7 @@

-->
<Files>
<Geography path="/projects/PublicMapping/local/data/tl_2010_51_county10_3785.shp">
<Geography path="/data/tl_2010_51_county10_3785.shp">
<!--

Each Field item defines a field in the shapefile that
Expand Down Expand Up @@ -1185,19 +1185,19 @@
unit of geography, and 2) the district it belongs to.

-->
<Blockfile path="/projects/PublicMapping/local/data/cd111_index.csv" />
<Blockfile path="/data/cd111_index.csv" />
</Template>

<Template name="State House">
<LegislativeBody ref="house"/>

<Blockfile path="/projects/PublicMapping/local/data/sldl10_index.csv" />
<Blockfile path="/data/sldl10_index.csv" />
</Template>

<Template name="State Senate">
<LegislativeBody ref="senate"/>

<Blockfile path="/projects/PublicMapping/local/data/sldu10_index.csv" />
<Blockfile path="/data/sldu10_index.csv" />
</Template>
</Templates>

Expand Down Expand Up @@ -1324,7 +1324,7 @@
<BardConfigs>
<BardConfig
id="tenpercent"
shape="/projects/PublicMapping/local/data/vablock_bard_save.Rdata"
shape="/data/vablock_bard_save.Rdata"
temp="/projects/PublicMapping/local/reports"
transform="/projects/PublicMapping/DistrictBuilder/docs/bard_template.xslt">
<PopVars>
Expand Down Expand Up @@ -1357,7 +1357,7 @@
</BardConfig>
<BardConfig
id="fivepercent"
shape="/projects/PublicMapping/local/data/vablock_bard_save.Rdata"
shape="/data/vablock_bard_save.Rdata"
temp="/projects/PublicMapping/local/reports"
transform="/projects/PublicMapping/DistrictBuilder/docs/bard_template.xslt">
<PopVars>
Expand Down
Loading