Skip to content

Commit 3566113

Browse files
committed
update CI
1 parent 47e44b0 commit 3566113

3 files changed

Lines changed: 26 additions & 25 deletions

File tree

.circleci/config.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,66 +11,66 @@ jobs:
1111

1212
- restore_cache:
1313
keys:
14-
- v2-dependencies-{{ checksum "requirements.txt" }}
15-
- v2-dependencies-
14+
- v3-dependencies-{{ checksum "requirements.txt" }}
15+
- v3-dependencies-
1616

1717
- run:
1818
name: Install dependencies for graphviz
1919
command: |
20-
sudo apt-get install -y graphviz sqlite3 libtiff-dev libsqlite3-dev
20+
sudo apt-get install -y graphviz sqlite3 libtiff-dev libsqlite3-dev
2121
2222
- run:
2323
name: Install dependencies for proj
2424
command: |
25-
sudo apt-get install -y libgeos-dev proj-data
25+
sudo apt-get install -y libgeos-dev proj-data
2626
2727
- run:
2828
name: build proj
2929
command: |
30-
# see https://stackoverflow.com/questions/72442087/cant-install-proj-8-0-0-for-cartopy-linux
31-
wget https://download.osgeo.org/proj/proj-9.0.0.tar.gz
32-
tar -xf proj-9.0.0.tar.gz
33-
cd proj-9.0.0
34-
mkdir build && cd build
35-
cmake ..
36-
cmake --build .
37-
sudo cmake --build . --target install
38-
cd ..
30+
# see https://stackoverflow.com/questions/72442087/cant-install-proj-8-0-0-for-cartopy-linux
31+
wget https://download.osgeo.org/proj/proj-9.0.0.tar.gz
32+
tar -xf proj-9.0.0.tar.gz
33+
cd proj-9.0.0
34+
mkdir build && cd build
35+
cmake ..
36+
cmake --build .
37+
sudo cmake --build . --target install
38+
cd ..
3939
4040
- run:
4141
name: install ldconfig
4242
command: |
43-
sudo ldconfig
43+
sudo ldconfig
4444
4545
- run:
4646
name: install dependencies
4747
command: |
48-
pip install -r requirements.txt
48+
pip install -r requirements.txt
4949
5050
- save_cache:
5151
paths:
5252
- ./venv
53-
key: v2-dependencies-{{ checksum "requirements.txt" }}
53+
key: v3-dependencies-{{ checksum "requirements.txt" }}
5454

5555
- run:
5656
name: check list of dependencies
5757
command: |
58-
pip freeze
59-
apt list --installed
58+
pip freeze
59+
apt list --installed
6060
6161
- run:
6262
name: run tests
6363
command: |
64-
export PYTHONPATH=src
65-
python setup.py unittests -d 20
64+
export PYTHONPATH=src
65+
python setup.py unittests -d 20
6666
6767
- run:
6868
name: wheel
6969
command: |
70-
export PYTHONPATH=src
71-
python ./setup.py bdist_wheel
72-
mkdir -p test-reports/dist
73-
cp dist/*.whl test-reports/dist
70+
export PYTHONPATH=src
71+
python ./setup.py bdist_wheel
72+
mkdir -p test-reports/dist
73+
cp dist/*.whl test-reports/dist
7474
7575
- store_artifacts:
7676
path: test-reports

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ install:
1515
# install precompiled versions not available on pypi
1616
- "%PYTHON%\\Scripts\\pymy_install3 llvmlite numba cartopy shapely pyproj"
1717
# other dependencies
18-
- "%PYTHON%\\Scripts\\pip install -r requirements.txt --no-deps"
18+
- "%PYTHON%\\Scripts\\pip install -r requirements.txt"
1919
- set PYTHONPATH=src
2020
build: off
2121

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ scikit-learn>=1.1
3939
sphinx
4040
sphinx-bootstrap-theme
4141
sphinxcontrib.imagesvg
42+
stack_data
4243
statsmodels
4344
tqdm
4445
traitlets

0 commit comments

Comments
 (0)