Skip to content

Commit

Permalink
Merge pull request #12 from collective/code-cleanup
Browse files Browse the repository at this point in the history
Code cleanup
  • Loading branch information
thet committed Dec 19, 2020
2 parents 8227f8c + e498e15 commit 86ee6f8
Show file tree
Hide file tree
Showing 13 changed files with 518 additions and 410 deletions.
12 changes: 12 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[settings]
force_alphabetical_sort = True
force_single_line = True
lines_after_imports = 2
not_skip = __init__.py
known_future_library=future,pies
# from black
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
combine_as_imports=True
line_length=88
73 changes: 48 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,70 @@ python:
sudo: false
cache:
directories:
- eggs
- parts/node
- eggs
- parts/node
jobs:
exclude:
- python: 3.6
env: PLONE_VERSION=4.3
env: PLONE_VERSION=4.3 MEMCACHED_LIBRARY=pylibmc
- python: 3.6
env: PLONE_VERSION=5.0
env: PLONE_VERSION=5.0 MEMCACHED_LIBRARY=pylibmc
- python: 3.6
env: PLONE_VERSION=5.1
env: PLONE_VERSION=5.1 MEMCACHED_LIBRARY=pylibmc
- python: 3.7
env: PLONE_VERSION=4.3
env: PLONE_VERSION=4.3 MEMCACHED_LIBRARY=pylibmc
- python: 3.7
env: PLONE_VERSION=5.0
env: PLONE_VERSION=5.0 MEMCACHED_LIBRARY=pylibmc
- python: 3.7
env: PLONE_VERSION=5.1
env: PLONE_VERSION=5.1 MEMCACHED_LIBRARY=pylibmc
- python: 3.8
env: PLONE_VERSION=4.3
env: PLONE_VERSION=4.3 MEMCACHED_LIBRARY=pylibmc
- python: 3.8
env: PLONE_VERSION=5.0
env: PLONE_VERSION=5.0 MEMCACHED_LIBRARY=pylibmc
- python: 3.8
env: PLONE_VERSION=5.1
env: PLONE_VERSION=5.1 MEMCACHED_LIBRARY=pylibmc
- python: 3.6
env: PLONE_VERSION=4.3 MEMCACHED_LIBRARY=python-memcached
- python: 3.6
env: PLONE_VERSION=5.0 MEMCACHED_LIBRARY=python-memcached
- python: 3.6
env: PLONE_VERSION=5.1 MEMCACHED_LIBRARY=python-memcached
- python: 3.7
env: PLONE_VERSION=4.3 MEMCACHED_LIBRARY=python-memcached
- python: 3.7
env: PLONE_VERSION=5.0 MEMCACHED_LIBRARY=python-memcached
- python: 3.7
env: PLONE_VERSION=5.1 MEMCACHED_LIBRARY=python-memcached
- python: 3.8
env: PLONE_VERSION=4.3 MEMCACHED_LIBRARY=python-memcached
- python: 3.8
env: PLONE_VERSION=5.0 MEMCACHED_LIBRARY=python-memcached
- python: 3.8
env: PLONE_VERSION=5.1 MEMCACHED_LIBRARY=python-memcached
fast_finish: true
env:
- PLONE_VERSION=4.3
- PLONE_VERSION=5.0
- PLONE_VERSION=5.1
- PLONE_VERSION=5.2
- PLONE_VERSION=4.3 MEMCACHED_LIBRARY=pylibmc
- PLONE_VERSION=4.3 MEMCACHED_LIBRARY=python-memcached
- PLONE_VERSION=5.0 MEMCACHED_LIBRARY=pylibmc
- PLONE_VERSION=5.0 MEMCACHED_LIBRARY=python-memcached
- PLONE_VERSION=5.1 MEMCACHED_LIBRARY=pylibmc
- PLONE_VERSION=5.1 MEMCACHED_LIBRARY=python-memcached
- PLONE_VERSION=5.2 MEMCACHED_LIBRARY=pylibmc
- PLONE_VERSION=5.2 MEMCACHED_LIBRARY=python-memcached
before_script:
- memcached -h
- memcached -h
install:
- sed -ie "s#test-5.2#test-$PLONE_VERSION#" buildout.cfg
- pip install -r requirements.txt
- buildout annotate
- buildout
- sed -ie "s#test-5.2#test-$PLONE_VERSION#" buildout.cfg
- sed -ie "s#test-eggs = python-memcached#test-eggs = $MEMCACHED_LIBRARY#" buildout.cfg
- pip install -r requirements.txt
- buildout annotate
- buildout
script:
- bin/code-analysis
- bin/test
- bin/code-analysis
- bin/test
after_success:
- bin/createcoverage --output-dir=htmlcov
- pip install coveralls
- coveralls
- bin/createcoverage --output-dir=htmlcov
- pip install coveralls
- coveralls
notifications:
irc: irc.freenode.org#plone-testing
9 changes: 8 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ Changelog
1.2 (unreleased)
----------------

- Nothing changed yet.
- Remove imports deprecated a decade ago.
[ale-rt]

- Drop support for ancient versions of pylibmc,
improve the documentation and make the test run also with pylibmc
[ale-rt]

- Code cleanup [ale-rt]


1.1 (2020-07-28)
Expand Down
Loading

0 comments on commit 86ee6f8

Please sign in to comment.