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

restructure python requirements files #1689

Merged
merged 1 commit into from
Jul 30, 2018
Merged

restructure python requirements files #1689

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
2 changes: 0 additions & 2 deletions .ci/osx_extra_python_requirements
View file
Open in desktop

This file was deleted.

13 changes: 7 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ ROOT = $(CURRENT_DIR)
ACTIVATE_RUNTIME_VENV ?= . venv/bin/activate
ACTIVATE_DEV_VENV ?= . venv_dev/bin/activate

VENV_REQ_FILE ?= .ci/basic_python_requirements
VENV_DEV_REQ_FILE ?= .ci/python_requirements
VENV_REQ_FILE ?= requirements_py/requirements.txt
VENV_DEV_REQ_FILE ?= requirements_py/dev/requirements.txt

OSX_EXTRAS_VENV_REQ_FILE ?= .ci/osx_extra_python_requirements
OSX_VENV_REQ_FILE ?= requirements_py/osx/requirements.txt

default: package

Expand Down Expand Up @@ -48,9 +48,10 @@ venv:
virtualenv -p python2 venv && \
$(ACTIVATE_RUNTIME_VENV) && pip install -r $(VENV_REQ_FILE)

add_osx_extras_to_venv:
# Run the extra build package.
$(ACTIVATE_RUNTIME_VENV) && pip install -r $(OSX_EXTRAS_VENV_REQ_FILE)
venv_osx:
# Create a virtual environment which can be used to run the build package.
virtualenv -p python2 venv && \
$(ACTIVATE_RUNTIME_VENV) && pip install -r $(OSX_VENV_REQ_FILE)

clean_venv:
rm -rf venv
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ git clone https://github.com/Ericsson/CodeChecker.git --depth 1 ~/codechecker
cd ~/codechecker

# Create a Python virtualenv and set it as your environment.
make venv
make add_osx_extras_to_venv
make venv_osx
source $PWD/venv/bin/activate

# Build and install a CodeChecker package.
Expand Down
2 changes: 1 addition & 1 deletion docs/authentication.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ sudo apt-get install libldap2-dev libsasl2-dev libssl-dev
source ~/checker_env/bin/activate

# install required python modules
pip install -r .ci/auth_requirements
pip install -r requirements_py/auth/requirements.txt
~~~

#### <a name="pam-authentication"></a> <i>PAM</i> authentication
Expand Down
0 .ci/auth_requirements → requirements_py/auth/requirements.txt
View file
Open in desktop
File renamed without changes.
0 .ci/python_requirements_psql_pg8000 → requirements_py/db_pg8000/requirements.txt
View file
Open in desktop
File renamed without changes.
0 .ci/python_requirements_psql_psycopg2 → requirements_py/db_psycopg2/requirements.txt
View file
Open in desktop
File renamed without changes.
0 .ci/python_requirements → requirements_py/dev/requirements.txt
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions requirements_py/osx/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
alembic==0.9.2
portalocker==1.1.0
psutil==5.2.2
sqlalchemy==1.1.11
thrift==0.9.1
scan-build==2.0.10
0 .ci/basic_python_requirements → requirements_py/requirements.txt
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ test_clean:
rm -rf build/workspace

# Use the proper requirement file for the given test configuration
test_matrix_sqlite: VENV_DEV_REQ_FILE = .ci/basic_python_requirements
test_matrix_sqlite: VENV_DEV_REQ_FILE = requirements_py/requirements.txt
test_matrix_sqlite: pycodestyle test_unit test_sqlite

test_matrix_psql_psycopg2: VENV_DEV_REQ_FILE = .ci/python_requirements_psql_psycopg2
test_matrix_psql_psycopg2: VENV_DEV_REQ_FILE = requirements_py/db_psycopg2/requirements.txt
test_matrix_psql_psycopg2: pycodestyle test_unit test_psql_psycopg2

test_matrix_psql_pg8000: VENV_DEV_REQ_FILE = .ci/python_requirements_psql_pg8000
test_matrix_psql_pg8000: VENV_DEV_REQ_FILE = requirements_py/db_pg8000/requirements.txt
test_matrix_psql_pg8000: pycodestyle test_unit test_psql_pg8000

clean_travis:
Expand Down