Skip to content

Commit

Permalink
Docker: Sync main Dockerfile to docker/ubuntu/Dockerfile (#3205)
Browse files Browse the repository at this point in the history
- Copies over the Ubuntu Dockerfile edited in #3170 to the main Dockerfile in the root of the repo.
- Adds a note at the top for future edits to the file (in both files).

Additionally, this includes a temporary fix for pytest-pylint where new version finds more issues than the old one, so we need to use the old one before we fix the issues.
  • Loading branch information
echoix authored Oct 19, 2023
1 parent 0bc5039 commit 37239ca
Show file tree
Hide file tree
Showing 3 changed files with 265 additions and 158 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/python-code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ jobs:
- name: Run Pylint on other files using pytest
run: |
pip install pytest pytest-pylint
pip install pytest pytest-pylint==0.19

Check warning on line 116 in .github/workflows/python-code-quality.yml

View workflow job for this annotation

GitHub Actions / Python Code Quality (ubuntu-22.04, 3.10, 3.7, 23.1.0, 3.9.2, 2.12.2)

Temporarily downgraded pytest-pylint to allow merging other PRs. The errors reported with a newer version seem legitimite and should be fixed (2023-10-18, see https://github.com/OSGeo/grass/pull/3205)
echo "::warning file=.github/workflows/python-code-quality.yml,line=116,col=42,endColumn=48::Temporarily downgraded pytest-pylint to allow merging other PRs. The errors reported with a newer version seem legitimite and should be fixed (2023-10-18, see https://github.com/OSGeo/grass/pull/3205)"
export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
pytest --pylint -m pylint --pylint-rcfile=.pylintrc --pylint-jobs=$(nproc) \
Expand Down
Loading

0 comments on commit 37239ca

Please sign in to comment.