1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 19:28:07 +00:00
Commit Graph

23 Commits

Author SHA1 Message Date
grossmj
66dd8bdadb Merge branch '2.2' into 3.0 2023-08-11 18:14:16 +10:00
grossmj
bbb0a407e0 Upgrade to PyQt 5.15.9 and pywin32 2023-08-11 18:13:41 +10:00
grossmj
263febecbc Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	appveyor.yml
#	dev-requirements.txt
#	gns3server/compute/base_node.py
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/utils/get_resource.py
#	gns3server/version.py
#	gns3server/web/route.py
#	requirements.txt
#	tests/handlers/api/compute/test_qemu.py
#	win-requirements.txt
2022-11-09 20:30:28 +08:00
grossmj
338128ca3e Upgrade pywin32 to v305 2022-11-08 23:39:10 +08:00
grossmj
f8ee3b3d50 Upgrade pywin32 to v304 2022-10-19 18:31:17 +08:00
grossmj
bbf9c04d20 Upgrade pywin32 to v304 2022-10-19 18:30:28 +08:00
grossmj
f8a83e7ff9 Merge branch '2.2' into 3.0
# Conflicts:
#	dev-requirements.txt
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/version.py
#	requirements.txt
2022-03-13 14:50:02 +10:30
grossmj
f7cc4e9574 Upgrade dependencies 2022-02-06 17:35:52 +10:30
dependabot[bot]
2897325f36
Bump pywin32 from 300 to 301
Bumps [pywin32](https://github.com/mhammond/pywin32) from 300 to 301.
- [Release notes](https://github.com/mhammond/pywin32/releases)
- [Changelog](https://github.com/mhammond/pywin32/blob/master/CHANGES.txt)
- [Commits](https://github.com/mhammond/pywin32/commits)

---
updated-dependencies:
- dependency-name: pywin32
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-09 20:45:46 +00:00
grossmj
91a6384a59 Upgrade dependencies. Fixes #1917 2021-06-12 15:30:26 +09:30
grossmj
802959f9ab Merge branch 'master' into 3.0
# Conflicts:
#	dev-requirements.txt
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/controller/compute.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/ethernet_switch_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_export_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/web/test_response.py
#	win-requirements.txt
2021-04-10 12:46:40 +09:30
grossmj
adbef787c3 Fix typo 2021-04-06 18:21:59 +09:30
grossmj
e614ed79f4 Upgrade dependencies 2021-04-06 13:57:00 +09:30
grossmj
bf19da1dc2 Upgrade packages to latest versions 2020-11-08 21:35:54 +10:30
grossmj
d0487b92c5 Remove pyup and pep8 script. 2020-06-26 19:20:40 +09:30
grossmj
7924963276 Remove tox and update dependencies 2020-06-26 19:08:21 +09:30
grossmj
c6da24f267 Move jsonschema 2.6.0 requirement in build repository.
https://github.com/GNS3/gns3-server/issues/1751
https://github.com/GNS3/gns3-gui/issues/2849

This is to avoid the following error:

```
ERROR: Double requirement given: jsonschema==2.6.0 (from -r gns3-gui\win-requirements.txt (line 4)) (already in jsonschema==3.2.0 (from -r gns3-gui\requirements.txt (line 1)), name='jsonschema')
```
2020-06-07 13:07:16 +09:30
grossmj
1f149769f2 Only use jsonschema 2.6.0 on Windows and macOS.
https://github.com/GNS3/gns3-server/issues/1751
https://github.com/GNS3/gns3-gui/issues/2849
2020-06-07 12:55:22 +09:30
grossmj
c9767a06b3 Early Hyper-V support to run the GNS3 VM. Ref https://github.com/GNS3/gns3-gui/issues/763. 2018-08-10 16:18:14 +07:00
ziajka
b1657996e3 Pywin32 instead of pypiwin32, Ref. #1276 2018-02-26 16:25:31 +01:00
ziajka
889aa3ba94 More generic dependency for pypiwin32, Ref. #1276 2018-01-29 15:26:45 +01:00
ziajka
cbb15c7a84 Check if locking version of pypiwin32==220 helps, Ref. #1276 2018-01-29 15:16:38 +01:00
Julien Duponchelle
722028b2d2
Install win32 dependencies for the tests 2017-04-18 12:27:54 +02:00