Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
grudge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexandru Fikl
grudge
Commits
7c35b26c
Commit
7c35b26c
authored
4 years ago
by
Alexandru Fikl
Browse files
Options
Downloads
Patches
Plain Diff
drop python2 support from the ci
parent
25010bf5
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.github/workflows/ci.yml
+1
-14
1 addition, 14 deletions
.github/workflows/ci.yml
.gitlab-ci.yml
+0
-39
0 additions, 39 deletions
.gitlab-ci.yml
setup.py
+1
-3
1 addition, 3 deletions
setup.py
with
2 additions
and
56 deletions
.github/workflows/ci.yml
+
1
−
14
View file @
7c35b26c
...
@@ -18,25 +18,12 @@ jobs:
...
@@ -18,25 +18,12 @@ jobs:
-
-
uses
:
actions/setup-python@v1
uses
:
actions/setup-python@v1
with
:
with
:
python-version
:
'
3.x'
python-version
:
'
3.x'
-
name
:
"
Main
Script"
-
name
:
"
Main
Script"
run
:
|
run
:
|
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
. ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)" examples test
. ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)" examples test
pytest2
:
name
:
Pytest on Py2
runs-on
:
ubuntu-latest
steps
:
-
uses
:
actions/checkout@v2
-
name
:
"
Main
Script"
run
:
|
sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml
grep -v mpi4py .test-conda-env-py2.yml > .test-conda-env.yml
CONDA_ENVIRONMENT=.test-conda-env.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
. ./build-and-test-py-project-within-miniconda.sh
pytest3
:
pytest3
:
name
:
Pytest on Py3
name
:
Pytest on Py3
runs-on
:
ubuntu-latest
runs-on
:
ubuntu-latest
...
...
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
0
−
39
View file @
7c35b26c
Python 2.7 POCL
:
script
:
-
export PY_EXE=python2.7
-
export PYOPENCL_TEST=portable:pthread
-
export EXTRA_INSTALL="pybind11 numpy mako"
-
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-
"
.
./build-and-test-py-project.sh"
tags
:
-
python2.7
-
pocl
-
mpi
# https://github.com/pocl/pocl/issues/757
allow_failure
:
true
except
:
-
tags
artifacts
:
reports
:
junit
:
test/pytest.xml
Python 3 POCL
:
Python 3 POCL
:
script
:
script
:
-
export PY_EXE=python3
-
export PY_EXE=python3
...
@@ -54,26 +35,6 @@ Python 3 Intel:
...
@@ -54,26 +35,6 @@ Python 3 Intel:
reports
:
reports
:
junit
:
test/pytest.xml
junit
:
test/pytest.xml
Python 2.7 POCL MPI
:
script
:
-
export PY_EXE=python2.7
-
export PYOPENCL_TEST=portable:pthread
-
export EXTRA_INSTALL="pybind11 numpy mako mpi4py pymetis"
-
export PYTEST_ADDOPTS="-k mpi"
-
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-
"
.
./build-and-test-py-project.sh"
tags
:
-
python2.7
-
pocl
-
mpi
# https://github.com/pocl/pocl/issues/757
allow_failure
:
true
except
:
-
tags
artifacts
:
reports
:
junit
:
test/pytest.xml
Python 3 POCL MPI
:
Python 3 POCL MPI
:
script
:
script
:
-
export PY_EXE=python3
-
export PY_EXE=python3
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
3
View file @
7c35b26c
...
@@ -31,9 +31,7 @@ def main():
...
@@ -31,9 +31,7 @@ def main():
'
Natural Language :: English
'
,
'
Natural Language :: English
'
,
'
Programming Language :: Python
'
,
'
Programming Language :: Python
'
,
'
Programming Language :: Python :: 2.6
'
,
'
Programming Language :: Python :: 3
'
,
'
Programming Language :: Python :: 2.7
'
,
# 3.x has not yet been tested.
'
Topic :: Scientific/Engineering
'
,
'
Topic :: Scientific/Engineering
'
,
'
Topic :: Scientific/Engineering :: Information Analysis
'
,
'
Topic :: Scientific/Engineering :: Information Analysis
'
,
'
Topic :: Scientific/Engineering :: Mathematics
'
,
'
Topic :: Scientific/Engineering :: Mathematics
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment