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.

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

Bump traitlets to v5.9 #526

Merged
merged 28 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0cfd10c
Bump traitlets to 5.9
danielhollas Oct 13, 2023
63125d1
Bump actions/checkout to v4
danielhollas Oct 13, 2023
4b3d85c
Run notebook tests with Python 3.9
danielhollas Oct 13, 2023
3224b65
Try pip install without -U
danielhollas Oct 13, 2023
e02c849
Bump pytest Docker
danielhollas Oct 13, 2023
c19abd4
Revert "Bump traitlets to 5.9"
danielhollas Oct 13, 2023
9fd58bc
Revert "Revert "Bump traitlets to 5.9""
danielhollas Oct 13, 2023
da96509
pip --no-cache-dir
danielhollas Oct 13, 2023
d244a8e
Print memory from inside the container
danielhollas Oct 13, 2023
098c6d6
Bump pytest
danielhollas Oct 13, 2023
fb732db
pytest~=7.0.0
danielhollas Oct 14, 2023
d1d6e9f
Comment out traitlets
danielhollas Oct 14, 2023
3a55166
Try increasing memory limit in the container
danielhollas Oct 14, 2023
d513689
pytest~=7.2.0
danielhollas Oct 14, 2023
cc667b4
pytest~=7.1.0
danielhollas Oct 14, 2023
a636997
Ignore deprecation warning
danielhollas Oct 14, 2023
31cc22a
Put -U back
danielhollas Oct 14, 2023
7b01c95
Ugh
danielhollas Oct 14, 2023
b1c639c
Back to square one
danielhollas Oct 14, 2023
5115b9f
Free again
danielhollas Oct 14, 2023
7ae9248
Wrap command
danielhollas Oct 14, 2023
6a9dcda
now?
danielhollas Oct 14, 2023
b2de54f
Pin to 5.9.0
danielhollas Oct 14, 2023
bd91f01
Ignore?
danielhollas Oct 18, 2023
a40e24c
Merge branch 'master' into deps/bump-traitlets
unkcpz Nov 8, 2023
57bc154
Update .github/workflows/ci.yml
unkcpz Nov 8, 2023
951e7db
Remove memory limit in docker-compose.yml
danielhollas Nov 8, 2023
9b2c30a
Merge branch 'master' into deps/bump-traitlets
unkcpz Nov 9, 2023
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
Expand All @@ -43,7 +43,7 @@ jobs:
matrix:
tag: [latest]
browser: [Chrome, Firefox]
python-version: ['3.10']
python-version: ['3.9']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
python-version: ['3.9']
python-version: ['3.10']

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let me try to change this back to 3.10 see if it still fine.

fail-fast: false

runs-on: ubuntu-latest
Expand All @@ -52,7 +52,7 @@ jobs:
steps:

- name: Check out app
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand All @@ -64,7 +64,7 @@ jobs:
**/pyproject.toml
**/requirements*.txt

- name: Install package
- name: Install package test dependencies
run: pip install -e .[dev]

- name: Set jupyter token env
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
steps:

- name: Check out app
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v2
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ filterwarnings = [
# TODO: This comes from a transitive dependency of optimade_client
# Remove this when this issue is addressed:
# https://github.com/CasperWA/ipywidgets-extended/issues/85
'ignore:metadata.*trait.*<traitlets.traitlets.Unicode object:DeprecationWarning:traitlets',
'ignore::DeprecationWarning:ipywidgets_extended',
'ignore:metadata.*traitlets.traitlets.Unicode object:DeprecationWarning:traitlets',
# For some reason we get this error, perhaps because we do
# not unload the AiiDA profile? Let's ignore this for now.
# E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <function Popen.__del__>
Expand All @@ -24,6 +25,7 @@ filterwarnings = [
# E _warn("subprocess %s is still running" % self.pid,
# E ResourceWarning: subprocess 382685 is still running
'ignore:Exception ignored in:pytest.PytestUnraisableExceptionWarning:_pytest',
'ignore::DeprecationWarning:pytest_html',
'ignore::DeprecationWarning:jupyter_client',
'ignore::DeprecationWarning:selenium',
'ignore::DeprecationWarning:pytest_selenium',
Expand Down
8 changes: 6 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ install_requires =
bokeh~=2.0
humanfriendly~=10.0
ipytree~=0.2
traitlets~=5.9.0
ipywidgets~=7.7
widgetsnbextension<3.6.3
more-itertools~=8.0
Expand All @@ -45,9 +46,12 @@ dev =
bumpver==2021.1114
pgtest==1.3.1
pre-commit==2.10.1
pytest~=6.2
# NOTE: pytest-selenium currently incompatible with pytest>=7.2
# Maybe could be made to work by installing 'py' dependency, see:
# https://docs.pytest.org/en/7.4.x/changelog.html#pytest-7-2-0-2022-10-23
pytest~=7.1.0
pytest-cov~=4.0
pytest-docker~=1.0
pytest-docker~=2.0
pytest-selenium~=4.0
selenium~=4.7.0
webdriver-manager~=3.8
Expand Down
2 changes: 1 addition & 1 deletion tests_notebooks/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def notebook_service(docker_ip, docker_services, aiidalab_exec):
aiidalab_exec("chmod -R a+rw /home/jovyan/apps/aiidalab-widgets-base", user="root")

# Install AWB with extra dependencies for SmilesWidget
aiidalab_exec("pip install -U .[smiles]")
aiidalab_exec("pip install --no-cache-dir .[smiles]")

# `port_for` takes a container port and returns the corresponding host port
port = docker_services.port_for("aiidalab", 8888)
Expand Down
4 changes: 4 additions & 0 deletions tests_notebooks/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ services:
- ..:/home/jovyan/apps/aiidalab-widgets-base
ports:
- 8998:8888
deploy:
resources:
limits:
memory: 2000M
danielhollas marked this conversation as resolved.
Show resolved Hide resolved
danielhollas marked this conversation as resolved.
Show resolved Hide resolved
Loading