Skip to content

Drop py2 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inducer merged 3 commits into from
Jul 19, 2020
Merged

Drop py2 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a979ca
Add .editorconfig
inducer Jul 19, 2020
30ff0f5
Declare py3 requirement
inducer Jul 19, 2020
0b36126
Drop Py2 from CIs
inducer Jul 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# https://editorconfig.org/
# https://github.com/editorconfig/editorconfig-vim
# https://github.com/editorconfig/editorconfig-emacs

root = true

[*]
indent_style = space
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.py]
indent_size = 4

[*.rst]
indent_size = 4

[*.cpp]
indent_size = 2

[*.hpp]
indent_size = 2

# There may be one in doc/
[Makefile]
indent_style = tab

# https://github.com/microsoft/vscode/issues/1679
[*.md]
trim_trailing_whitespace = false
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
-
uses: actions/setup-python@v1
with:
python-version: '3.x'
python-version: '3.x'
- name: "Main Script"
run: |
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [2.7, 3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8]
steps:
- uses: actions/checkout@v2
-
Expand Down
13 changes: 0 additions & 13 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
Python 2.7:
script:
- py_version=2.7
- 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
except:
- tags
artifacts:
reports:
junit: test/pytest.xml

Python 3:
script:
- py_version=3
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
'Topic :: Utilities',
],

python_requires="~=3.6",
install_requires=[
"ply>=3.4",
"pycparser>=2.18,<2.20",
Expand Down