Skip to content

Use PySide2 from EDM instead of PyPI and Use the latest EDM version (3.0.1) #538

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

Merged
aaronayres35 merged 3 commits into from
Oct 29, 2020
Merged

Use PySide2 from EDM instead of PyPI and Use the latest EDM version (3.0.1) #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8e856c
install pyside2 from edm not pip
aaronayres35 Oct 28, 2020
1b6c2a3
ci was failing, make same change done on traits ui to add enthought/lgpl
aaronayres35 Oct 28, 2020
375dd4e
use newest edm version so new change will work
aaronayres35 Oct 28, 2020
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: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ addons:

env:
global:
- INSTALL_EDM_VERSION=2.0.0
- INSTALL_EDM_VERSION=3.0.1
PYTHONUNBUFFERED="1"
QT_DEBUG_PLUGINS="1"

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ environment:

global:
PYTHONUNBUFFERED: "1"
INSTALL_EDM_VERSION: "2.0.0"
INSTALL_EDM_VERSION: "3.0.1"

matrix:
- RUNTIME: '3.6'
Expand Down
15 changes: 8 additions & 7 deletions ci/edmtool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
github_url_fmt = "git+http://github.com/enthought/{0}.git#egg={0}"

extra_dependencies = {
'pyside2': set(), # pyside2 is pip-installed during the install step
'pyside2': {'pyside2'},
'pyqt': {'pyqt'},
'pyqt5': {'pyqt5'},
'null': set()
Expand Down Expand Up @@ -139,19 +139,20 @@ def install(runtime, toolkit, environment, source):
parameters = get_parameters(runtime, toolkit, environment)
parameters['packages'] = ' '.join(
dependencies | extra_dependencies.get(toolkit, set()))

if toolkit == "pyside2":
additional_repositories = "--add-repository enthought/lgpl"
else:
additional_repositories = ""

# edm commands to setup the development environment
commands = [
"edm environments create {environment} --force --version={runtime}",
"edm install -y -e {environment} {packages}",
"edm install -y -e {environment} {packages} " + additional_repositories,
("edm run -e {environment} -- pip install -r ci/requirements.txt"
" --no-dependencies"),
"edm run -e {environment} -- pip install . --no-deps",
]
# pip install pyside2, because we don't have it in EDM yet
if toolkit == 'pyside2':
commands.append(
"edm run -e {environment} -- pip install pyside2==5.11"
)

click.echo("Creating environment '{environment}'".format(**parameters))
execute(commands, parameters)
Expand Down