Skip to content

Commit bee248d

Browse files
chinyeunglichinyeungli
committed
Merge with the latest skeleton code
Signed-off-by: Chin Yeung Li <[email protected]>
2 parents 15a3174 + 4004ebe commit bee248d

31 files changed

+1862
-738
lines changed

‎azure-pipelines.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@ jobs:
1111
parameters:
1212
job_name: ubuntu18_cpython
1313
image_name: ubuntu-18.04
14-
python_versions: ['3.6', '3.7', '3.8', '3.9']
14+
python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
1515
test_suites:
1616
all: venv/bin/pytest -n 2 -vvs
1717

1818
- template: etc/ci/azure-posix.yml
1919
parameters:
2020
job_name: ubuntu20_cpython
2121
image_name: ubuntu-20.04
22-
python_versions: ['3.6', '3.7', '3.8', '3.9']
22+
python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
2323
test_suites:
2424
all: venv/bin/pytest -n 2 -vvs
2525

2626
- template: etc/ci/azure-posix.yml
2727
parameters:
2828
job_name: macos1015_cpython
2929
image_name: macos-10.15
30-
python_versions: ['3.6', '3.7', '3.8', '3.9']
30+
python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
3131
test_suites:
3232
all: venv/bin/pytest -n 2 -vvs
3333

3434
- template: etc/ci/azure-win.yml
3535
parameters:
3636
job_name: win2016_cpython
3737
image_name: vs2017-win2016
38-
python_versions: ['3.6', '3.7', '3.8', '3.9']
38+
python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
3939
test_suites:
4040
all: venv\Scripts\pytest -n 2 -vvs
4141

4242
- template: etc/ci/azure-win.yml
4343
parameters:
4444
job_name: win2019_cpython
4545
image_name: windows-2019
46-
python_versions: ['3.6', '3.7', '3.8', '3.9']
46+
python_versions: ['3.6', '3.7', '3.8', '3.9', '3.10']
4747
test_suites:
4848
all: venv\Scripts\pytest -n 2 -vvs
4949

‎configure‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ CFG_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5656
CFG_BIN_DIR=$CFG_ROOT_DIR/$VIRTUALENV_DIR/bin
5757

5858
# Find packages from the local thirdparty directory or from thirdparty.aboutcode.org
59-
PIP_EXTRA_ARGS="--find-links $CFG_ROOT_DIR/thirdparty --find-links https://thirdparty.aboutcode.org/pypi"
59+
if [ -f "$CFG_ROOT_DIR/thirdparty" ]; then
60+
PIP_EXTRA_ARGS="--find-links $CFG_ROOT_DIR/thirdparty "
61+
fi
62+
PIP_EXTRA_ARGS="$PIP_EXTRA_ARGS --find-links https://thirdparty.aboutcode.org/pypi"
6063

6164

6265
################################

‎configure.bat‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,15 @@ set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
4848

4949
@rem ################################
5050
@rem # Thirdparty package locations and index handling
51+
<<<<<<< HEAD
5152
set "PIP_EXTRA_ARGS=--find-links "%CFG_ROOT_DIR%\thirdparty" --find-links https://thirdparty.aboutcode.org/pypi" & %INDEX_ARG%
53+
=======
54+
if exist ""%CFG_ROOT_DIR%\thirdparty"" (
55+
set "PIP_EXTRA_ARGS=--find-links %CFG_ROOT_DIR%\thirdparty "
56+
)
57+
58+
set "PIP_EXTRA_ARGS=%PIP_EXTRA_ARGS% --find-links https://thirdparty.aboutcode.org/pypi" & %INDEX_ARG%
59+
>>>>>>> refs/remotes/skeleton/main
5260
@rem ################################
5361

5462
@rem ################################
@@ -157,7 +165,11 @@ if %ERRORLEVEL% neq 0 (
157165
if exist "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" (
158166
rmdir /s /q "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin"
159167
)
168+
<<<<<<< HEAD
160169
mklink /J "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
170+
=======
171+
mklink /J %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts
172+
>>>>>>> refs/remotes/skeleton/main
161173

162174
if %ERRORLEVEL% neq 0 (
163175
exit /b %ERRORLEVEL%

‎docs/source/conf.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
2929
# ones.
3030
extensions = [
31+
'sphinx.ext.intersphinx',
3132
]
3233

3334
# Add any paths that contain templates here, relative to this directory.
@@ -62,4 +63,4 @@
6263

6364
html_css_files = [
6465
'_static/theme_overrides.css'
65-
]
66+
]

‎etc/ci/azure-container-deb.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
parameters:
2+
job_name: ''
3+
container: ''
4+
python_path: ''
5+
python_version: ''
6+
package_manager: apt-get
7+
install_python: ''
8+
install_packages: |
9+
set -e -x
10+
sudo apt-get -y update
11+
sudo apt-get -y install \
12+
build-essential \
13+
xz-utils zlib1g bzip2 libbz2-1.0 tar \
14+
sqlite3 libxml2-dev libxslt1-dev \
15+
software-properties-common openssl
16+
test_suite: ''
17+
test_suite_label: ''
18+
19+
20+
jobs:
21+
- job: ${{ parameters.job_name }}
22+
23+
pool:
24+
vmImage: 'ubuntu-16.04'
25+
26+
container:
27+
image: ${{ parameters.container }}
28+
options: '--name ${{ parameters.job_name }} -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -v /usr/bin/docker:/tmp/docker:ro'
29+
30+
steps:
31+
- checkout: self
32+
fetchDepth: 10
33+
34+
- script: /tmp/docker exec -t -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -u 0 ${{ parameters.job_name }} $(Build.SourcesDirectory)/etc/ci/install_sudo.sh ${{ parameters.package_manager }}
35+
displayName: Install sudo
36+
37+
- script: ${{ parameters.install_packages }}
38+
displayName: Install required packages
39+
40+
- script: ${{ parameters.install_python }}
41+
displayName: 'Install Python ${{ parameters.python_version }}'
42+
43+
- script: ${{ parameters.python_path }} --version
44+
displayName: 'Show Python version'
45+
46+
- script: PYTHON_EXE=${{ parameters.python_path }} ./configure --dev
47+
displayName: 'Run Configure'
48+
49+
- script: ${{ parameters.test_suite }}
50+
displayName: 'Run ${{ parameters.test_suite_label }} tests with py${{ parameters.python_version }} on ${{ parameters.job_name }}'

‎etc/ci/azure-container-rpm.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
parameters:
2+
job_name: ''
3+
image_name: 'ubuntu-16.04'
4+
container: ''
5+
python_path: ''
6+
python_version: ''
7+
package_manager: yum
8+
install_python: ''
9+
install_packages: |
10+
set -e -x
11+
sudo yum groupinstall -y "Development Tools"
12+
sudo yum install -y \
13+
openssl openssl-devel \
14+
sqlite-devel zlib-devel xz-devel bzip2-devel \
15+
bzip2 tar unzip zip \
16+
libxml2-devel libxslt-devel
17+
test_suite: ''
18+
test_suite_label: ''
19+
20+
21+
jobs:
22+
- job: ${{ parameters.job_name }}
23+
24+
pool:
25+
vmImage: ${{ parameters.image_name }}
26+
27+
container:
28+
image: ${{ parameters.container }}
29+
options: '--name ${{ parameters.job_name }} -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -v /usr/bin/docker:/tmp/docker:ro'
30+
31+
steps:
32+
- checkout: self
33+
fetchDepth: 10
34+
35+
- script: /tmp/docker exec -t -e LANG=C.UTF-8 -e LC_ALL=C.UTF-8 -u 0 ${{ parameters.job_name }} $(Build.SourcesDirectory)/etc/ci/install_sudo.sh ${{ parameters.package_manager }}
36+
displayName: Install sudo
37+
38+
- script: ${{ parameters.install_packages }}
39+
displayName: Install required packages
40+
41+
- script: ${{ parameters.install_python }}
42+
displayName: 'Install Python ${{ parameters.python_version }}'
43+
44+
- script: ${{ parameters.python_path }} --version
45+
displayName: 'Show Python version'
46+
47+
- script: PYTHON_EXE=${{ parameters.python_path }} ./configure --dev
48+
displayName: 'Run Configure'
49+
50+
- script: ${{ parameters.test_suite }}
51+
displayName: 'Run ${{ parameters.test_suite_label }} tests with py${{ parameters.python_version }} on ${{ parameters.job_name }}'

‎etc/ci/azure-posix.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
displayName: 'Install Python $(python_version)'
3232

3333
- script: |
34+
python --version
3435
python3 --version
3536
python$(python_version) --version
3637
echo "python$(python_version)" > PYTHON_EXECUTABLE

‎etc/ci/install_sudo.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
set -e
3+
4+
5+
if [[ "$1" == "apt-get" ]]; then
6+
apt-get update -y
7+
apt-get -o DPkg::Options::="--force-confold" install -y sudo
8+
9+
elif [[ "$1" == "yum" ]]; then
10+
yum install -y sudo
11+
12+
elif [[ "$1" == "dnf" ]]; then
13+
dnf install -y sudo
14+
15+
fi

0 commit comments

Comments
 (0)