Skip to content

Commit

Permalink
Add setup.py install_requirements definition.
Browse files Browse the repository at this point in the history
Update travis file using new requirements.
Create requirements folder.
create pip_tools, base, test and travis requirements files.
Remove old requirements file.
Add Makefile.
Add makefile upgrade command.
Include requirements files generated using upgrade command.
Add openedx.yaml and include OEPs list.
Add venv to gitignore.
  • Loading branch information
ericfab179 committed May 10, 2020
1 parent b8ec05b commit 2fbc4f2
Show file tree
Hide file tree
Showing 14 changed files with 130 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
venv/

# Installer logs
pip-log.txt
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ dist: xenial # required for Python >= 3.7 (travis-ci/travis-ci#9069)
python:
- 3.5
- 3.8
install: pip install -r requirements.txt
install:
- pip install -r requirements/travis.txt
script:
- pycodestyle . --max-line-length=419 # TODO 419 --> 120
deploy:
Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -q -r requirements/pip_tools.txt
pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
4 changes: 4 additions & 0 deletions openedx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---

oeps:
oep-18: true
7 changes: 0 additions & 7 deletions requirements.txt

This file was deleted.

10 changes: 10 additions & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Core requirements for using this package
-c constraints.txt


bleach
boto
fs
mako
simplejson
webob
23 changes: 23 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# make upgrade
#
appdirs==1.4.3 # via fs
bleach==3.1.5 # via -r requirements/base.in
boto==2.49.0 # via -r requirements/base.in
fs==2.4.11 # via -r requirements/base.in
mako==1.1.2 # via -r requirements/base.in
markupsafe==1.1.1 # via mako
packaging==20.3 # via bleach
pyparsing==2.4.7 # via packaging
pytz==2020.1 # via fs
simplejson==3.17.0 # via -r requirements/base.in
six==1.14.0 # via bleach, fs, packaging
typing==3.7.4.1 # via fs
webencodings==0.5.1 # via bleach
webob==1.8.6 # via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
# setuptools
9 changes: 9 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Version constraints for pip-installation.
#
# This file doesn't install any packages. It specifies version constraints
# that will be applied if a package is needed.
#
# When pinning something here, please provide an explanation of why. Ideally,
# link to other information that will help people in the future to remove the
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.
4 changes: 4 additions & 0 deletions requirements/pip_tools.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Dependencies to run compile tools
-c constraints.txt

pip-tools # Contains pip-compile, used to generate pip requirements files
12 changes: 12 additions & 0 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# make upgrade
#
click==7.1.2 # via pip-tools
pip-tools==5.1.2 # via -r requirements/pip_tools.in
six==1.14.0 # via pip-tools

# The following packages are considered to be unsafe in a requirements file:
# pip
6 changes: 6 additions & 0 deletions requirements/test.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Requirements for test runs
-c constraints.txt

-r base.txt # Core dependencies for the cookiecutter

pycodestyle
24 changes: 24 additions & 0 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# make upgrade
#
appdirs==1.4.3 # via -r requirements/base.txt, fs
bleach==3.1.5 # via -r requirements/base.txt
boto==2.49.0 # via -r requirements/base.txt
fs==2.4.11 # via -r requirements/base.txt
mako==1.1.2 # via -r requirements/base.txt
markupsafe==1.1.1 # via -r requirements/base.txt, mako
packaging==20.3 # via -r requirements/base.txt, bleach
pycodestyle==2.5.0 # via -r requirements/test.in
pyparsing==2.4.7 # via -r requirements/base.txt, packaging
pytz==2020.1 # via -r requirements/base.txt, fs
simplejson==3.17.0 # via -r requirements/base.txt
six==1.14.0 # via -r requirements/base.txt, bleach, fs, packaging
typing==3.7.4.1 # via -r requirements/base.txt, fs
webencodings==0.5.1 # via -r requirements/base.txt, bleach
webob==1.8.6 # via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
# setuptools
4 changes: 4 additions & 0 deletions requirements/travis.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Requirements for running tests in Travis
-c constraints.txt

-r test.txt
24 changes: 24 additions & 0 deletions requirements/travis.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# make upgrade
#
appdirs==1.4.3 # via -r requirements/test.txt, fs
bleach==3.1.5 # via -r requirements/test.txt
boto==2.49.0 # via -r requirements/test.txt
fs==2.4.11 # via -r requirements/test.txt
mako==1.1.2 # via -r requirements/test.txt
markupsafe==1.1.1 # via -r requirements/test.txt, mako
packaging==20.3 # via -r requirements/test.txt, bleach
pycodestyle==2.5.0 # via -r requirements/test.txt
pyparsing==2.4.7 # via -r requirements/test.txt, packaging
pytz==2020.1 # via -r requirements/test.txt, fs
simplejson==3.17.0 # via -r requirements/test.txt
six==1.14.0 # via -r requirements/test.txt, bleach, fs, packaging
typing==3.7.4.1 # via -r requirements/test.txt, fs
webencodings==0.5.1 # via -r requirements/test.txt, bleach
webob==1.8.6 # via -r requirements/test.txt

# The following packages are considered to be unsafe in a requirements file:
# setuptools

0 comments on commit 2fbc4f2

Please sign in to comment.