Skip to content
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.

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

Update requirements for Python version #1014

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.6'
- '3.7'
- '3.8'
# - '3.9'
- '3.9'
os:
- linux
- win64
Expand Down Expand Up @@ -124,10 +123,9 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.6'
- '3.7'
- '3.8'
# - '3.9'
- '3.9'
steps:
- uses: actions/checkout@v2
- name: Set up Conda
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.6'
- '3.6' # TODO remove once support for 3.6 is dropped entirely
- '3.7'
- '3.8'
# - '3.9'
- '3.9'
os:
- linux
- win64
Expand Down
3 changes: 2 additions & 1 deletion .pylint/pylintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

[MASTER]
init-hook="import sys; sys.path.append('.pylint')"
# https://github.com/PyCQA/pylint/issues/4577
init-hook="import sys; sys.path.append('.pylint'); import astroid; astroid.context.InferenceContext.max_inferred = 500"
load-plugins=foqus_transform
extension-pkg-whitelist=PyQt5
ignore-patterns=test_*,conftest,
Expand Down
4 changes: 2 additions & 2 deletions docs/source/chapt_install/install_python.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Install Python
--------------

Python version 3.6 up through 3.8 is required to run FOQUS.
Python version 3.7 up through 3.9 is required to run FOQUS.

We recommend using either the `Miniconda <https://docs.conda.io/en/latest/miniconda.html>`_ or
`Anaconda <https://www.anaconda.com/download/>`_ Python distribution and package management
Expand All @@ -17,7 +17,7 @@ ability to create self-contained python environments without any need for admini
privileges. These separate environments can have different set of packages, isolating version
dependencies when working with multiple python projects.

If you have a working version of Python 3.6 through 3.8, which you prefer over Anaconda, you can
If you have a working version of Python 3.7 through 3.9, which you prefer over Anaconda, you can
skip these steps.

Anaconda or Miniconda Install and Setup
Expand Down
5 changes: 2 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

# These will override requirements picked up from setup.py below:
# pinning the pylint version to ensure reproducible behavior and defaults
pylint==2.6.0
pylint
# also pinning the version for astroid (used by pylint to analyze the AST)
# since there can be significant differences between (non-major) versions,
# both in terms of behavior and performance
astroid==2.4.2
astroid
pytest
### coverage
coverage
Expand All @@ -15,7 +15,6 @@ black==21.5b2

# pytest-qt-extras
pytest-qt==4.0.*
dataclasses;python_version<"3.7"
python-slugify
oyaml
# singledispatchmethod needed for < 3.8
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
maintainer=ver.maintainer,
maintainer_email=ver.maintainer_email,
url=ver.webpage,
python_requires=">=3.7,<3.10",
packages=find_packages(),
py_modules=["pytest_qt_extras"],
package_data={
Expand Down Expand Up @@ -99,7 +100,8 @@
"numpy",
"pandas",
"psutil",
"PyQt5==5.13",
"PyQt5==5.12.3; sys_platform == 'win32' and python_version >= '3.9'",
"PyQt5==5.13; sys_platform != 'win32' or python_version < '3.9'",
# pinning pywin32 to version 225 as a workaround for Python 3.8 compatibility issues
# (ImportError: DLL load failed while importing ...)
# for more information see e.g. https://stackoverflow.com/a/62249872
Expand Down