Skip to content

Commit

Permalink
Merge pull request bartfeenstra#905 from bartfeenstra/update-all-depe…
Browse files Browse the repository at this point in the history
…ndencies-20221103

Update all Pip and npm dependencies
  • Loading branch information
bartfeenstra authored Nov 3, 2022
2 parents d69c01e + a7dd437 commit 33f4221
Show file tree
Hide file tree
Showing 18 changed files with 73 additions and 65 deletions.
24 changes: 12 additions & 12 deletions betty/assets/public/static/css/betty.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import "accessibility.css";
@import "citation.css";
@import "entity.css";
@import "file.css";
@import "meta.css";
@import "overlay.css";
@import "page.css";
@import "permalink.css";
@import "person.css";
@import "search.css";
@import "show.css";
@import "text.css";
@import url("accessibility.css");
@import url("citation.css");
@import url("entity.css");
@import url("file.css");
@import url("meta.css");
@import url("overlay.css");
@import url("page.css");
@import url("permalink.css");
@import url("person.css");
@import url("search.css");
@import url("show.css");
@import url("text.css");
2 changes: 1 addition & 1 deletion betty/assets/public/static/css/overlay.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables.css";
@import url("variables.css");

.has-overlay {
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion betty/assets/public/static/css/page.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables.css";
@import url("variables.css");

html {
height: 100%;
Expand Down
2 changes: 1 addition & 1 deletion betty/assets/public/static/css/permalink.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables.css";
@import url("variables.css");

.permalink {
color: #777;
Expand Down
2 changes: 1 addition & 1 deletion betty/assets/public/static/css/search.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables.css";
@import url("variables.css");

#search {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion betty/assets/public/static/css/show.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables.css";
@import url("variables.css");

.with-js .show.show-shown .show-if-hidden {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion betty/assets/public/static/css/text.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables.css";
@import url("variables.css");

html {
font-size: 1.2em;
Expand Down
2 changes: 1 addition & 1 deletion betty/http_api_doc/assets/betty.npm._Npm/src/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dependencies": {
"redoc": "^2.0.0-rc.66"
"redoc": "^2.0.0"
}
}
16 changes: 8 additions & 8 deletions betty/maps/assets/betty.npm._Npm/src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"node": ">= 16"
},
"dependencies": {
"@babel/core": "^7.17.9",
"@babel/preset-env": "^7.16.11",
"babel-loader": "^8.2.5",
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"babel-loader": "^9.1.0",
"clean-webpack-plugin": "^4.0.0",
"core-js": "^3.22.1",
"core-js": "^3.26.0",
"css-loader": "^6.7.1",
"file-loader": "^6.2.0",
"leaflet": "^1.8.0",
"leaflet": "^1.9.2",
"leaflet-gesture-handling": "^1.2.2",
"mini-css-extract-plugin": "^2.6.0",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2"
"mini-css-extract-plugin": "^2.6.1",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0"
},
"scripts": {
"webpack": "webpack --config webpack.config.js"
Expand Down
2 changes: 1 addition & 1 deletion betty/tests/model/test___init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ class _OtherOne(Entity):
one: Optional[TestOneToOne._One]

def test(self) -> None:
assert{'one'} == {
assert {'one'} == {
association.attr_name
for association
in _EntityTypeAssociationRegistry.get_associations(self._OtherOne)
Expand Down
1 change: 1 addition & 0 deletions betty/tests/test_locale.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def _readlines(self, directory_path: Path) -> Iterator[str]:
lambda line: not line.startswith((
'"POT-Creation-Date: ',
'"PO-Revision-Date: ',
'"Generated-By: ',
)),
f.readlines(),
)
Expand Down
18 changes: 9 additions & 9 deletions betty/trees/assets/betty.npm._Npm/src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"node": ">= 16"
},
"dependencies": {
"@babel/core": "^7.17.9",
"@babel/preset-env": "^7.16.11",
"babel-loader": "^8.2.5",
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"babel-loader": "^9.1.0",
"clean-webpack-plugin": "^4.0.0",
"core-js": "^3.22.1",
"core-js": "^3.26.0",
"css-loader": "^6.7.1",
"cytoscape": "^3.21.1",
"cytoscape-dagre": "^2.4.0",
"mini-css-extract-plugin": "^2.6.0",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2"
"cytoscape": "^3.23.0",
"cytoscape-dagre": "^2.5.0",
"mini-css-extract-plugin": "^2.6.1",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0"
},
"scripts": {
"webpack": "webpack --config webpack.config.js"
Expand Down
10 changes: 10 additions & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const { defineConfig } = require('cypress')

module.exports = defineConfig({
video: false,
e2e: {
setupNodeEvents(on, config) {
return require('./cypress/plugins/index.js')(on, config)
},
},
})
3 changes: 0 additions & 3 deletions cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"node": ">= 16"
},
"devDependencies": {
"cypress": "^9.5.4",
"eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3",
"cypress": "^10.11.0",
"eslint": "^8.26.0",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-compat": "^4.0.2",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0",
"stylelint": "^14.7.1",
"stylelint-config-standard": "^25.0.0",
"stylelint-no-unsupported-browser-features": "^5.0.3"
"eslint-plugin-promise": "^6.1.1",
"stylelint": "^14.14.1",
"stylelint-config-standard": "^29.0.0",
"stylelint-no-unsupported-browser-features": "^6.0.1"
},
"scripts": {
"cypress": "cypress",
Expand Down
36 changes: 18 additions & 18 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,51 +40,51 @@
],
'python_requires': '~= 3.8',
'install_requires': [
'aiofiles ~= 0.8.0',
'aiofiles ~= 22.1.0',
'aiohttp ~= 3.8.1',
'babel ~= 2.9.1',
'babel ~= 2.11.0',
'click ~= 8.1.2',
'geopy ~= 2.2.0',
'graphlib-backport ~= 1.0.3; python_version < "3.9"',
'jinja2 ~= 3.1.1',
'jsonschema ~= 4.4.0',
'jsonschema ~= 4.17.0',
'markupsafe ~= 2.1.1',
'orderedset ~= 2.0.3',
'pdf2image ~= 1.16.0',
'polib ~= 1.1.1',
'PyQt6 ~= 6.3.0',
'PyQt6 ~= 6.4.0',
'python-resize-image ~= 1.1.20',
'pyyaml ~= 6.0.0',
'reactives ~= 0.4.2',
'typing_extensions ~= 4.2.0; python_version < "3.10"',
'typing_extensions ~= 4.4.0; python_version < "3.10"',
],
'extras_require': {
'development': [
'aioresponses ~= 0.7.3',
'autopep8 ~= 1.6.0',
'autopep8 ~= 2.0.0',
'codecov ~= 2.1.12',
'coverage ~= 6.3.2',
'flake8 ~= 4.0.1',
'coverage ~= 6.5.0',
'flake8 ~= 5.0.4',
'html5lib ~= 1.1',
'lxml ~= 4.8.0',
'lxml ~= 4.9.1',
'mypy ~= 0.950',
'pip-licenses ~= 3.5.3',
'pyinstaller ~= 5.0',
'pytest ~= 7.1.1',
'pytest ~= 7.2.0',
'pytest-aioresponses ~= 0.2.0 ',
'pytest-asyncio ~= 0.18.3 ',
'pytest-cov ~= 3.0.0',
'pytest-mock ~= 3.7.0',
'pytest-qt ~= 4.0.2',
'pytest-asyncio ~= 0.20.1 ',
'pytest-cov ~= 4.0.0',
'pytest-mock ~= 3.10.0',
'pytest-qt ~= 4.2.0',
'pytest-xvfb ~= 2.0.0',
'setuptools ~= 62.1.0',
'setuptools ~= 65.5.0',
'twine ~= 4.0.0',
'types-aiofiles ~= 0.8.8',
'types-aiofiles ~= 22.1.0',
'types-mock ~= 4.0.13',
'types-polib ~= 1.1.12',
'types-pyyaml ~= 6.0.6',
'types-requests ~= 2.27.19',
'types-setuptools ~= 57.4.14',
'types-requests ~= 2.28.11.2',
'types-setuptools ~= 65.5.0.2',
'wheel ~= 0.37.1',
],
},
Expand Down

0 comments on commit 33f4221

Please sign in to comment.