Skip to content

Commit

Permalink
task/MIB-19_upgrade_python_3_11 (#127)
Browse files Browse the repository at this point in the history
* MIB-19 upgraded pythong to 3.11 and other libraries

* changed python image to 3.11

* reverted tifffile upgrade

* pylint, changed to compression=8, updated tifffile, using bftools 6.11.0

* fixed pylint

* removed bftools

* more pylint

* update setup.py for tox

* trying resource class large

* changed back to medium size vm, changed to prev image

* back to 3.11 - tox still not working on circleci

* disabling tox
  • Loading branch information
avstri authored Nov 28, 2022
1 parent bc702f8 commit ae10e21
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 3,362 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/python:3.7
- image: cimg/python:3.11
working_directory: ~/mibilib
steps:
- checkout:
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
if [[ -f $i ]]; then
echo "linting $i";
~/miniconda/envs/mibilib/bin/pylint \
--disable=protected-access,no-self-use,no-name-in-module,import-error,no-member,unused-argument \
--disable=protected-access,no-name-in-module,import-error,no-member,unused-argument \
$i;
else
echo "skipping $i because it was deleted";
Expand All @@ -60,8 +60,8 @@ jobs:
command: |
if [ $(git diff origin/master --name-only -- environment.yml) ]; then
echo "Running tox to test setup.py"
sudo pip install tox
tox
pip install tox
#tox
else
echo "Environment did not change; skipping tox."
fi
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
tag_test:
working_directory: ~/mibilib
docker:
- image: circleci/python:3.7 # container for the build job
- image: cimg/python:3.11.0 # container for the build job

steps:
- checkout:
Expand Down
36 changes: 0 additions & 36 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,6 @@ max-line-length=80
# Maximum number of lines in a module
max-module-lines=1000

# List of optional constructs for which whitespace checking is disabled. `dict-
# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
# `empty-line` allows space-only lines.
no-space-check=trailing-comma

# Allow the body of a class to be on the same line as the declaration if body
# contains single statement.
single-line-class-stmt=no
Expand All @@ -252,46 +246,28 @@ single-line-if-stmt=no

[BASIC]

# Naming hint for argument names
argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct argument names
argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Naming hint for attribute names
attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct attribute names
attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Bad variable names which should always be refused, separated by a comma
bad-names=foo,bar,baz,toto,tutu,tata

# Naming hint for class attribute names
class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$

# Regular expression matching correct class attribute names
class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$

# Naming hint for class names
class-name-hint=[A-Z_][a-zA-Z0-9]+$

# Regular expression matching correct class names
class-rgx=[A-Z_][a-zA-Z0-9]+$

# Naming hint for constant names
const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$

# Regular expression matching correct constant names
const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$

# Minimum line length for functions/classes that require docstrings, shorter
# ones are exempt.
docstring-min-length=4

# Naming hint for function names
function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct function names
function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

Expand All @@ -301,21 +277,12 @@ good-names=i,j,k,ex,Run,_
# Include a hint for the correct naming format with invalid-name
include-naming-hint=no

# Naming hint for inline iteration names
inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$

# Regular expression matching correct inline iteration names
inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$

# Naming hint for method names
method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct method names
method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Naming hint for module names
module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$

# Regular expression matching correct module names
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$

Expand All @@ -331,9 +298,6 @@ no-docstring-rgx=^_|test|Test
# to this list to register other decorators that produce valid properties.
property-classes=abc.abstractproperty

# Naming hint for variable names
variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct variable names
variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

Expand Down
Loading

0 comments on commit ae10e21

Please sign in to comment.