Skip to content

Commit

Permalink
Fix: Problems from alias failing tests (#243)
Browse files Browse the repository at this point in the history
* chore: Add dependency links that install from source

* chore: Move alias to install version with django-cms 4.0 support

* chore: Drop python 3.7 & fix tox
  • Loading branch information
marksweb authored Jun 1, 2023
1 parent 051e8da commit 409c4bc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"django-sekizai>=0.7",
"django-admin-sortable2>=0.6.4",
]
DEPENDENCY_LINKS = [
"https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms",
"https://github.com/django-cms/djangocms-versioning/tarball/1.2.2#egg=djangocms-versioning",
]

setup(
name="djangocms-moderation",
Expand All @@ -25,6 +29,7 @@
"Topic :: Software Development",
],
install_requires=INSTALL_REQUIREMENTS,
dependency_links=DEPENDENCY_LINKS,
author="Divio AG",
author_email="[email protected]",
maintainer='Django CMS Association and contributors',
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements/requirements_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms
https://github.com/django-cms/djangocms-text-ckeditor/tarball/support/4.0.x#egg=djangocms-text-ckeditor
https://github.com/django-cms/djangocms-versioning/tarball/1.2.2#egg=djangocms-versioning
https://github.com/FidelityInternational/djangocms-version-locking/tarball/1.2.0#egg=djangocms-version-locking
https://github.com/django-cms/djangocms-alias/tarball/master#egg=djangocms-alias
https://github.com/django-cms/djangocms-alias/tarball/support/django-cms-4.0.x#egg=djangocms-alias
17 changes: 9 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
[tox]
envlist =
dj32-flake8
dj32-isort
py{37,38,39}-dj{22,32}-sqlite-cms4
flake8
isort
py{38,39}-dj{22,32}-sqlite-cms4

skip_missing_interpreters=True

[testenv]
deps =
dj22: -r{toxinidir}/tests/requirements/django_22.txt
dj22: -r{toxinidir}/tests/requirements/dj22_cms40.txt
dj22: Django>=2.2,<2.3

dj32: -r{toxinidir}/tests/requirements/django_32.txt
dj32: -r{toxinidir}/tests/requirements/dj32_cms40.txt
dj32: Django>=3.2,<3.3

basepython =
py37: python3.7
py38: python3.8
py39: python3.9

Expand All @@ -26,9 +25,11 @@ commands =
{env:COMMAND:coverage} report

[testenv:flake8]
commands = flake8
basepython = python3.9
commands = flake8
deps = flake8

[testenv:isort]
commands = isort --recursive --check-only --diff {toxinidir}
basepython = python3.9
commands = isort --check-only --diff {toxinidir}
deps = isort

0 comments on commit 409c4bc

Please sign in to comment.