Skip to content

Commit ce601a9

Browse files
author
Rashad Kanavath
committed
Merge remote-tracking branch 'upstream/master' into cmake_build2
2 parents 4f75c29 + 9019e6c commit ce601a9

396 files changed

Lines changed: 9135 additions & 4934 deletions

File tree

Some content is hidden

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

‎.dockerignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
docker
22
!docker/testdata
3+
!docker/alpine/alpine-py38-ctypes.patch
4+
!docker/alpine/alpine-py38-gisinit.patch
35
.git
46
.gitignore
57
.github

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: "[Bug]"
5+
labels: 'bug'
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
16+
1. Go to '...'
17+
2. Click on '...'
18+
3. Compute '...'
19+
4. See error
20+
21+
**Expected behavior**
22+
A clear and concise description of what you expected to happen.
23+
24+
**Screenshots**
25+
If applicable, add screenshots to help explain your problem.
26+
27+
**System description (please complete the following information):**
28+
29+
- Operating System: [e.g. Windows, Linux, ..., incl. version]
30+
- GRASS GIS version [e.g. 7.8.1]
31+
32+
<!---
33+
34+
- details about further software components
35+
- run `g.version -rge` in a GRASS GIS terminal session or check in
36+
the GUI menu "Help > About"
37+
--->
38+
39+
**Additional context**
40+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: "[Feat]"
5+
labels: 'enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is.
12+
Ex. I'm always frustrated when [...]
13+
14+
**Describe the solution you'd like**
15+
A clear and concise description of what you want to happen.
16+
17+
**Describe alternatives you've considered**
18+
A clear and concise description of any alternative solutions or features
19+
you've considered.
20+
21+
**Additional context**
22+
Add any other context or screenshots about the feature request here.

‎.github/workflows/apt.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
bison
2+
build-essential
3+
flex
4+
libbz2-dev
5+
libcairo-dev
6+
libfftw3-dev
7+
libgdal-dev
8+
libgl1-mesa-dev
9+
libglu1-mesa-dev
10+
libnetcdf-dev
11+
libopenblas-dev
12+
libpng-dev
13+
libproj-dev
14+
libreadline-dev
15+
libzstd-dev
16+
python3-dateutil
17+
python3-numpy
18+
python3-ply
19+
python3-six
20+
python3-termcolor
21+
sqlite3
22+
zlib1g-dev

‎.github/workflows/build.sh‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#!/usr/bin/env bash
2+
3+
# The make step requires something like:
4+
# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/lib"
5+
# further steps additionally require:
6+
# export PATH="$PATH:$PREFIX/bin"
7+
8+
# fail on non-zero return code from a subprocess
9+
set -e
10+
11+
# print commands
12+
set -x
13+
14+
if [ -z "$1" ]
15+
then
16+
echo "Usage: $0 PREFIX"
17+
exit 1
18+
fi
19+
20+
# non-existent variables as an errors
21+
set -u
22+
23+
export INSTALL_PREFIX=$1
24+
25+
./configure \
26+
--prefix="$INSTALL_PREFIX/" \
27+
--enable-largefile \
28+
--with-cxx \
29+
--with-zstd \
30+
--with-bzlib \
31+
--with-blas \
32+
--with-lapack \
33+
--with-readline \
34+
--with-openmp \
35+
--with-pthread \
36+
--with-tiff \
37+
--with-freetype \
38+
--with-freetype-includes="/usr/include/freetype2/" \
39+
--with-proj-share=/usr/share/proj \
40+
--with-geos \
41+
--with-sqlite \
42+
--with-fftw \
43+
--with-netcdf
44+
45+
make
46+
make install

‎.github/workflows/build_centos.sh‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/usr/bin/env bash
2+
3+
# The make step requires something like:
4+
# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/lib"
5+
# further steps additionally require:
6+
# export PATH="$PATH:$PREFIX/bin"
7+
8+
# fail on non-zero return code from a subprocess
9+
set -e
10+
11+
# print commands
12+
set -x
13+
14+
if [ -z "$1" ]
15+
then
16+
echo "Usage: $0 PREFIX"
17+
exit 1
18+
fi
19+
20+
# non-existent variables as an errors
21+
set -u
22+
23+
export INSTALL_PREFIX=$1
24+
25+
./configure \
26+
--prefix="$INSTALL_PREFIX/" \
27+
--without-freetype \
28+
--with-sqlite \
29+
--with-cairo --with-cairo-ldflags=-lfontconfig \
30+
--with-freetype --with-freetype-includes=/usr/include/freetype2 \
31+
--with-proj --with-proj-share=/usr/share/proj \
32+
--with-gdal=/usr/bin/gdal-config \
33+
--without-zstd \
34+
--without-tiff \
35+
--without-ffmpeg \
36+
--without-mysql \
37+
--without-postgres \
38+
--without-odbc \
39+
--without-fftw
40+
41+
make
42+
make install

‎.github/workflows/centos.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: CentOS
2+
3+
on:
4+
- push
5+
- pull_request
6+
7+
jobs:
8+
build:
9+
name: ${{ matrix.os }} build
10+
11+
runs-on: ubuntu-18.04
12+
container: ${{ matrix.os }}
13+
strategy:
14+
matrix:
15+
os:
16+
- centos:7
17+
fail-fast: false
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
- name: Get dependencies
22+
run: |
23+
yum install -y epel-release
24+
yum install -y wget gawk
25+
yum install -y $(cat .github/workflows/yum.txt)
26+
- name: Install conda
27+
run: |
28+
wget https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh
29+
chmod u+x Anaconda3-2020.02-Linux-x86_64.sh
30+
./Anaconda3-2020.02-Linux-x86_64.sh -b
31+
- name: Set variables with conda executable and activate
32+
run: |
33+
echo "::set-env name=CONDA::/github/home/anaconda3/bin/conda"
34+
echo "::set-env name=CONDA_ACTIVATE::/github/home/anaconda3/bin/activate"
35+
- name: Get GRASS GIS runtime conda dependencies
36+
run: |
37+
source $CONDA_ACTIVATE
38+
$CONDA install -y -c anaconda numpy wxpython python-dateutil ply termcolor
39+
- name: Create installation directory
40+
run: |
41+
mkdir $HOME/install
42+
- name: Set number of cores for compilation
43+
run: |
44+
echo "::set-env name=MAKEFLAGS::-j$(nproc)"
45+
- name: Set LD_LIBRARY_PATH for compilation
46+
run: |
47+
echo "::set-env name=LD_LIBRARY_PATH::$HOME/install/lib"
48+
- name: Build
49+
run: |
50+
source $CONDA_ACTIVATE
51+
.github/workflows/build_centos.sh $HOME/install
52+
- name: Add the bin directory to PATH
53+
run: |
54+
echo "::add-path::$HOME/install/bin"
55+
- name: Test executing of the grass command
56+
run: |
57+
source $CONDA_ACTIVATE
58+
.github/workflows/test_simple.sh

‎.github/workflows/ci.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: CI
2+
3+
on:
4+
- push
5+
- pull_request
6+
7+
jobs:
8+
build:
9+
name: ${{ matrix.os }} build
10+
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
os:
15+
- ubuntu-16.04
16+
- ubuntu-18.04
17+
fail-fast: false
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
- name: Get dependencies
22+
run: |
23+
sudo apt-get update -y
24+
sudo apt-get install -y wget git gawk findutils
25+
xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
26+
sudo apt-get install -y --no-install-recommends --no-install-suggests
27+
- name: Create installation directory
28+
run: |
29+
mkdir $HOME/install
30+
- name: Ensure one core for compilation
31+
run: |
32+
echo "::set-env name=MAKEFLAGS::-j1"
33+
- name: Set LD_LIBRARY_PATH for compilation
34+
run: |
35+
echo "::set-env name=LD_LIBRARY_PATH::$HOME/install/lib"
36+
- name: Build
37+
run: .github/workflows/build.sh $HOME/install
38+
39+
test:
40+
name: ${{ matrix.os }} tests
41+
42+
runs-on: ${{ matrix.os }}
43+
strategy:
44+
matrix:
45+
os:
46+
- ubuntu-16.04
47+
- ubuntu-18.04
48+
fail-fast: false
49+
50+
steps:
51+
- uses: actions/checkout@v2
52+
- name: Get dependencies
53+
run: |
54+
sudo apt-get update -y
55+
sudo apt-get install -y wget git gawk findutils
56+
xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
57+
sudo apt-get install -y --no-install-recommends --no-install-suggests
58+
- name: Create installation directory
59+
run: |
60+
mkdir $HOME/install
61+
- name: Set number of cores for compilation
62+
run: |
63+
echo "::set-env name=MAKEFLAGS::-j$(nproc)"
64+
- name: Set LD_LIBRARY_PATH for compilation
65+
run: |
66+
echo "::set-env name=LD_LIBRARY_PATH::$HOME/install/lib"
67+
- name: Build
68+
run: .github/workflows/build.sh $HOME/install
69+
- name: Add the bin directory to PATH
70+
run: |
71+
echo "::add-path::$HOME/install/bin"
72+
- name: Test executing of the grass command
73+
run: .github/workflows/test_simple.sh
74+
- name: Run tests
75+
run: .github/workflows/test_thorough.sh

0 commit comments

Comments
 (0)