Skip to content

chore(dev): remove legacy PYTHONPATH config #87

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

Draft
alessandrodi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(dev): remove legacy PYTHONPATH config #87

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
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ Log files are available in `/var/log/eduid` within this container.
When source directories are properly symlinked in the `sources/` directory, changes to your local code will automatically reload in the running containers. The containers are configured to:

- Mount your local source tree in `/opt/eduid/src`
- Add the source paths to `PYTHONPATH`
- Run with the `--reload` flag for automatic reloading

This applies to both the main package and its eduID dependencies.
Expand Down
7 changes: 0 additions & 7 deletions eduid/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
x-common-env-variables: &common-env-variables
PYTHONPATH: /opt/eduid/sources/:/opt/eduid/src/
EDUID_CONFIG_YAML: /opt/eduid/config.yaml
extra_args: --reload

Expand Down Expand Up @@ -131,7 +130,6 @@ services:
- ../sources/sunet-auth-server/src/auth_server:/opt/eduid/sources/auth_server:ro
environment:
<<: *common-env-variables
PYTHONPATH: /opt/eduid/sources/:/opt/sunet/sunet-auth-server/src/
HOSTNAME: auth_server
app_name: auth_server
config_file: /opt/eduid/config.yaml
Expand Down Expand Up @@ -185,7 +183,6 @@ services:
- ../sources/eduid/dev-extra-modules.txt:/opt/eduid/sources/eduid/dev-extra-modules.txt:ro
environment:
<<: *common-env-variables
PYTHONPATH: /opt/eduid/sources/:/opt/eduid/src/pysaml2/src:/opt/eduid/src/
HOSTNAME: bankid
eduid_name: bankid
EDUID_CONFIG_NS: /eduid/webapp/bankid
Expand Down Expand Up @@ -300,7 +297,6 @@ services:
- ../sources/eduid/dev-extra-modules.txt:/opt/eduid/sources/eduid/dev-extra-modules.txt:ro
environment:
<<: *common-env-variables
PYTHONPATH: /opt/eduid/sources/:/opt/eduid/src/pysaml2/src:/opt/eduid/src/
HOSTNAME: eidas
eduid_name: eidas
EDUID_CONFIG_NS: /eduid/webapp/eidas
Expand Down Expand Up @@ -445,7 +441,6 @@ services:
- ../eduid-idp/profiling:/opt/eduid/eduid-idp/profiling
environment:
<<: *common-env-variables
PYTHONPATH: /opt/eduid/sources/:/opt/eduid/src/pysaml2/src:/opt/eduid/src/pyXMLSecurity/src:/opt/eduid/src/
HOSTNAME: idp
eduid_name: idp
EDUID_CONFIG_NS: /eduid/webapp/idp
Expand Down Expand Up @@ -550,7 +545,6 @@ services:
- ../sources/eduid/dev-extra-modules.txt:/opt/eduid/sources/eduid/dev-extra-modules.txt:ro
environment:
<<: *common-env-variables
PYTHONPATH: /opt/eduid/sources/:/opt/eduid/src/
REQUESTS_CA_BUNDLE: /etc/ssl/rootCA.crt
HOSTNAME: jsconfig
eduid_name: jsconfig
Expand Down Expand Up @@ -847,7 +841,6 @@ services:
tmpfs:
- /var/lib/softhsm # re-init every time
environment:
PYTHONPATH: /opt/eduid/src/pyeleven/src
ENABLE_PKCS11_SPY: anything
depends_on:
<<: *common-depends-on
Expand Down