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

Refactored devsite/test Juniper requirements files #293

Merged
merged 1 commit into from
Dec 7, 2020
Merged

Refactored devsite/test Juniper requirements files #293

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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Disabled pytest coverage to troubleshoot Python 3 support
language: python

matrix:
include:
- python: 2.7
Expand All @@ -13,10 +14,9 @@ matrix:
- python: 2.7
env: TOXENV=edx_lint_check
- python: 3.5
env: TOXENV=py35-juniper_community
env: TOXENV=py35-juniper
- python: 3.8
env: TOXENV=py38-juniper_community

env: TOXENV=py38-juniper

node_js:
- "node"
Expand Down
2 changes: 0 additions & 2 deletions ...e/requirements/py35_juniper_community.txt → devsite/requirements/juniper_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,3 @@ pytest-cov==2.8.1
tox==3.15.0
freezegun==0.3.12
edx-lint==1.4.1

mock==3.0.5
80 changes: 0 additions & 80 deletions devsite/requirements/juniper_community.txt
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions devsite/requirements/py35_juniper.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

-r juniper_base.txt

mock==3.0.5
4 changes: 4 additions & 0 deletions devsite/requirements/py38_juniper.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

-r juniper_base.txt

mock==4.0.2
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_community
py27-hawthorn_multisite
py35-juniper_community
py38-juniper_community
py35-juniper
py38-juniper
lint
edx_lint_check

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

whitelist_externals =
git
Expand All @@ -39,15 +39,15 @@ setenv =
PYTHONPATH = {toxinidir}
# We don't need to call out Hawthorn as it is the current default environment
ginkgo: OPENEDX_RELEASE = GINKGO
py35_juniper_community: OPENEDX_RELEASE = JUNIPER
py38_juniper_community: OPENEDX_RELEASE = JUNIPER
py35_juniper: OPENEDX_RELEASE = JUNIPER
py38_juniper: OPENEDX_RELEASE = JUNIPER

commands =
ginkgo: pytest -c pytest-ginkgo.ini {posargs}
hawhthorn_community: pytest {posargs}
hawhthorn_multisite: pytest {posargs}
py35_juniper_community: pytest -c pytest-juniper.ini {posargs}
py38_juniper_community: pytest -c pytest-juniper.ini {posargs}
py35_juniper: pytest -c pytest-juniper.ini {posargs}
py38_juniper: pytest -c pytest-juniper.ini {posargs}

[testenv:lint]
basepython=python2
Expand Down