Skip to content

Commit a080549

Browse files
caviricaviri
committed
fix: Fixed requirements.txt
1 parent 6840ca5 commit a080549

8 files changed

Lines changed: 125 additions & 33 deletions

File tree

‎.DS_Store‎

-6 KB
Binary file not shown.

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# ODTP dev
2+
odtp
3+
odtp-input
4+
odtp-output
5+
odtp-logs
6+
17
# Mac crap
28
.DS_Store
39

‎Dockerfile‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
11
FROM ubuntu:22.04
22

3-
RUN apt update
4-
RUN apt install python3.10 python3-pip -y
5-
63
##################################################
74
# Ubuntu setup
85
##################################################
96

10-
RUN apt-get update \
11-
&& apt-get install -y wget \
12-
&& rm -rf /var/lib/apt/lists/*
13-
14-
RUN apt-get update && apt-get -y upgrade \
15-
&& apt-get install -y --no-install-recommends \
7+
# Ubuntu setup
8+
RUN apt update && apt install -y \
9+
python3.10 \
10+
python3-pip \
11+
wget \
1612
unzip \
1713
nano \
18-
git \
14+
git \
1915
g++ \
2016
gcc \
2117
htop \
2218
zip \
23-
ca-certificates \
24-
&& rm -rf /var/lib/apt/lists/*
19+
ca-certificates && \
20+
rm -rf /var/lib/apt/lists/*
2521

2622
##################################################
2723
# ODTP setup
@@ -100,4 +96,7 @@ COPY ./odtp-component-client /odtp/odtp-component-client
10096
COPY ./app /odtp/odtp-app
10197
WORKDIR /odtp
10298

99+
# Fix for end of the line issue on Windows. Avoid error when building on windows
100+
RUN find /odtp -type f -iname "*.sh" -exec sed -i 's/\r$//' {} \;
101+
103102
ENTRYPOINT ["bash", "/odtp/odtp-component-client/startup.sh"]

‎README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ODTP component for running Eqasim.
44
| Tool Info | Links |
55
| --- | --- |
66
| Original Tool (IDF & Corsica)| [https://github.com/eqasim-org/ile-de-france](https://github.com/eqasim-org/ile-de-france) |
7-
| Current Tool Version (IDF & Corsica) | [fb1112d2a7d1817746be84413da584c391059ad1](https://github.com/eqasim-org/ile-de-france/commit/fb1112d2a7d1817746be84413da584c391059ad1) |
7+
| Current Tool Version (IDF & Corsica) | [3c9b137b9e4b3c17e163cae2e170f18611adcf56](https://github.com/eqasim-org/ile-de-france/commit/3c9b137b9e4b3c17e163cae2e170f18611adcf56) |
88
| Original Tool (CH Scenario)| [https://gitlab.ethz.ch/ivt-vpl/populations/ch-zh-synpop](https://gitlab.ethz.ch/ivt-vpl/populations/ch-zh-synpop) |
99
| Current Tool Version (CH Scenario) | [4658daa2e441dcda132622e7fcb47da1df8c47d6](https://gitlab.ethz.ch/ivt-vpl/populations/ch-zh-synpop/-/commit/4658daa2e441dcda132622e7fcb47da1df8c47d6) |
1010

@@ -86,11 +86,14 @@ docker build -t odtp-eqasim .
8686

8787
```
8888
docker run -it --rm \
89-
-v {PATH_TO_YOUR_INPUT_VOLUME}:/odtp/odtp-input \
90-
-v {PATH_TO_YOUR_OUTPUT_VOLUME}:/odtp/odtp-output \
89+
-v ${pwd}/odtp-input:/odtp/odtp-input \
90+
-v ${pwd}/odtp-output:/odtp/odtp-output \
91+
-v ${pwd}/odtp-logs:/odtp/odtp-logs \
9192
--env-file .env odtp-eqasim
9293
```
9394

95+
docker run -it --rm -v ${pwd}/odtp-input:/odtp/odtp-input -v ${pwd}/odtp-output:/odtp/odtp-output -v ${pwd}/odtp-logs:/odtp/odtp-logs --env-file .env --entrypoint bash odtp-eqasim
96+
9497

9598

9699
### Example of tmux session
@@ -121,8 +124,10 @@ If you want to kill the session just write `exit`. Also use `tmux ls` to list al
121124

122125
## Changelog
123126

127+
124128
- v0.4.6
125-
- Rasterio 1.3.8 included in `requirements.txt` to avoid building errors
129+
- Rasterio 1.3.8, and fiona 1.9.6 included in `requirements.txt` to avoid building errors
130+
- Version fixed at [`3c9b137b9e4b3c17e163cae2e170f18611adcf56`](https://github.com/eqasim-org/ile-de-france/commit/3c9b137b9e4b3c17e163cae2e170f18611adcf56)
126131
- odtp-component-client upgrade to v0.1.1
127132
- included github-action for docker images building
128133

‎app/app.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if [ "$SCENARIO" == "IDF" ]; then
55
# Cloning Scenario
66
git clone https://github.com/eqasim-org/ile-de-france.git /odtp/odtp-workdir/scenario
77
cd /odtp/odtp-workdir/scenario
8-
git checkout fb1112d2a7d1817746be84413da584c391059ad1
8+
git checkout 3c9b137b9e4b3c17e163cae2e170f18611adcf56
99

1010
# Preparing parameters & config file
1111
# Reading placeholders and create config file from environment variables
@@ -23,7 +23,8 @@ elif [ "$SCENARIO" == "CORSICA" ]; then
2323
# Cloning Scenario
2424
git clone https://github.com/eqasim-org/ile-de-france.git /odtp/odtp-workdir/scenario
2525
cd /odtp/odtp-workdir/scenario
26-
git checkout fb1112d2a7d1817746be84413da584c391059ad1
26+
git checkout 3c9b137b9e4b3c17e163cae2e170f18611adcf56
27+
2728

2829
# Preparing parameters & config file
2930
# Reading placeholders and create config file from environment variables

‎data/.gitkeep‎

Whitespace-only changes.

‎odtp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file should contain basic component information for your component.
22
component-name: odtp-eqasim
33
component-author: Carlos Vivar Rios
4-
component-version: 0.4.6
4+
component-version: v0.4.6
55
component-repository: https://github.com/odtp-org/odtp-eqasim
66
component-license: AGPL-3.0
77
component-type: ephemeral

‎requirements.txt‎

Lines changed: 95 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,103 @@
1-
matplotlib==3.7.2
2-
rasterio==1.3.8
3-
pandas==2.0.3
4-
scipy==1.11.1
5-
numpy==1.23.5
1+
access==1.1.9
2+
affine==2.4.0
3+
attrs==24.2.0
4+
beautifulsoup4==4.12.3
5+
blosc2==2.0.0
6+
Brotli==1.1.0
7+
certifi==2024.8.30
8+
charset-normalizer==3.4.0
9+
click==8.1.7
10+
click-plugins==1.1.1
11+
cligj==0.7.2
12+
contourpy==1.3.0
13+
cycler==0.12.1
14+
Cython==3.0.11
15+
dbus-python==1.2.18
16+
deprecation==2.1.0
17+
esda==2.5.1
18+
et_xmlfile==2.0.0
19+
exceptiongroup==1.2.2
20+
fiona==1.9.6
21+
fonttools==4.54.1
622
geopandas==0.13.2
23+
giddy==2.3.5
24+
idna==3.10
25+
inequality==1.0.1
26+
inflate64==1.0.0
27+
iniconfig==2.0.0
28+
joblib==1.4.2
29+
kiwisolver==1.4.7
30+
libpysal==4.12.1
31+
llvmlite==0.40.1
32+
mapclassify==2.8.1
33+
matplotlib==3.7.2
34+
mgwr==2.2.1
35+
momepy==0.8.1
36+
mpmath==1.3.0
37+
msgpack==1.1.0
38+
multivolumefile==0.2.3
39+
networkx==3.4.2
740
numba==0.57.1
41+
numexpr==2.10.1
42+
numpy==1.23.5
43+
openpyxl==3.1.2
44+
packaging==24.1
845
palettable==3.3.3
46+
pandas==2.0.3
47+
patsy==0.5.6
48+
pillow==11.0.0
49+
platformdirs==4.3.6
50+
pluggy==1.5.0
51+
pointpats==2.4.0
52+
psutil==6.1.0
53+
PuLP==2.9.0
54+
py-cpuinfo==9.0.0
55+
py7zr==0.20.5
56+
pybcj==1.0.2
57+
pycryptodomex==3.21.0
58+
pymongo==4.10.1
59+
pyparsing==3.0.9
60+
pyppmd==1.0.0
61+
pyproj==3.7.0
62+
pysal==23.1
63+
pytest==7.4.0
64+
python-dateutil==2.9.0.post0
65+
python-Levenshtein==0.12.1
66+
pytz==2024.2
67+
pyzmq==26.2.0
68+
pyzstd==0.16.2
69+
quantecon==0.7.2
70+
rasterio==1.3.8
71+
rasterstats==0.20.0
72+
requests==2.32.3
73+
Rtree==1.3.0
974
scikit-learn==1.3.0
75+
scipy==1.11.1
76+
seaborn==0.13.2
77+
segregation==2.5.1
1078
shapely==2.0.1
11-
tqdm==4.65.0
12-
tables==3.8.0
13-
xlrd==2.0.1
14-
openpyxl==3.1.2
15-
pip==22.0.2
1679
simpledbf==0.2.6
80+
simplejson==3.19.3
81+
six==1.16.0
82+
snuggs==1.4.7
83+
soupsieve==2.6
84+
spaghetti==1.7.6
85+
spglm==1.1.0
86+
spint==1.0.7
87+
splot==1.1.7
88+
spopt==0.6.1
89+
spreg==1.8
90+
spvcm==0.3.0
91+
statsmodels==0.14.4
92+
sympy==1.13.3
1793
synpp==1.5.1
18-
python-levenshtein==0.12.1
19-
pytest==7.4.0
94+
tables==3.8.0
95+
texttable==1.7.0
96+
threadpoolctl==3.5.0
97+
tobler==0.12.0
98+
tomli==2.0.2
99+
tqdm==4.65.0
100+
tzdata==2024.2
101+
urllib3==2.2.3
102+
xlrd==2.0.1
20103
xlwt==1.3.0
21-
pysal==23.1
22-
py7zr==0.20.5

0 commit comments

Comments
 (0)