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.

Sign up for GitHub

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

Reorganize the requirements files for Juniper tox tests #345

Merged
merged 1 commit into from
May 24, 2021
Merged

Reorganize the requirements files for Juniper tox tests #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
- python: 2.7
tox-env: py27-hawthorn_multisite
- python: 3.5
tox-env: py35-juniper
- python: 3.8
tox-env: py38-juniper
tox-env: py35-juniper_community
- python: 3.5
tox-env: py35-juniper_multisite
- python: 3.8
tox-env: lint
- python: 3.8
Expand Down
7 changes: 5 additions & 2 deletions devsite/requirements/juniper_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pytz==2020.1
## Django package dependencies
##

Django==2.2.15
Django==2.2.16

djangorestframework==3.9.4
django-countries==5.5
Expand All @@ -35,6 +35,9 @@ django-environ==0.4.5

jsonfield==2.1.1

# For


##
## Documentation (Sphinx) dependencies
##
Expand All @@ -49,7 +52,6 @@ Sphinx==3.1.2
edx-opaque-keys[django]==2.1.0
#edx-drf-extensions==6.0.0

edx-organizations==5.2.0

##
## Devsite
Expand All @@ -75,3 +77,4 @@ pytest-cov==2.8.1
tox==3.15.0
freezegun==0.3.12
edx-lint==1.4.1
mock==3.0.5
5 changes: 5 additions & 0 deletions devsite/requirements/juniper_community.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Requirements needed for Juniper community environment

-r juniper_base.txt

edx-organizations==5.2.0
6 changes: 6 additions & 0 deletions devsite/requirements/juniper_multisite.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Requirements needed for Juniper multisite environment

-r juniper_base.txt

# Organization/site mapping requires Appsembler's fork
git+https://github.com/appsembler/[email protected]
4 changes: 0 additions & 4 deletions devsite/requirements/py35_juniper.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions devsite/requirements/py38_juniper.txt
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ envlist =
py27-ginkgo
py27-hawthorn
py27-hawthorn_multisite
py35-juniper
py38-juniper
py35-juniper_community
py35-juniper_multisite
lint
edx_lint_check

Expand All @@ -27,8 +27,8 @@ deps =
ginkgo: -r{toxinidir}/devsite/requirements/ginkgo.txt
hawthorn: -r{toxinidir}/devsite/requirements/hawthorn.txt
hawthorn_multisite: -r{toxinidir}/devsite/requirements/hawthorn_multisite.txt
py35_juniper: -r{toxinidir}/devsite/requirements/py35_juniper.txt
py38_juniper: -r{toxinidir}/devsite/requirements/py38_juniper.txt
juniper_community: -r{toxinidir}/devsite/requirements/juniper_community.txt
juniper_multisite: -r{toxinidir}/devsite/requirements/juniper_multisite.txt

whitelist_externals =
git
Expand All @@ -40,15 +40,15 @@ setenv =
ginkgo: OPENEDX_RELEASE = GINKGO
hawthorn: OPENEDX_RELEASE = HAWTHORN
hawthorn_multisite: OPENEDX_RELEASE = HAWTHORN
py35_juniper: OPENEDX_RELEASE = JUNIPER
py38_juniper: OPENEDX_RELEASE = JUNIPER
juniper_community: OPENEDX_RELEASE = JUNIPER
juniper_multisite: OPENEDX_RELEASE = JUNIPER

commands =
ginkgo: pytest -c pytest-ginkgo.ini {posargs}
hawthorn: pytest -c pytest-hawthorn.ini {posargs}
hawthorn_multisite: pytest -c pytest-hawthorn.ini {posargs}
py35_juniper: pytest -c pytest-juniper.ini {posargs}
py38_juniper: pytest -c pytest-juniper.ini {posargs}
juniper_community: pytest -c pytest-juniper.ini {posargs}
juniper_multisite: pytest -c pytest-juniper.ini {posargs}

[testenv:lint]
basepython=python2
Expand Down