1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-29 10:18:10 +00:00
Commit Graph

62 Commits

Author SHA1 Message Date
grossmj
d9214a3c67 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/virtualbox/__init__.py
#	gns3server/controller/gns3vm/virtualbox_gns3_vm.py
#	gns3server/crash_report.py
#	gns3server/version.py
#	requirements.txt
2023-09-23 15:54:54 +10:00
grossmj
05ef9f2a7c No need for dev dependencies 2023-09-03 16:59:48 +07:00
grossmj
476658b829 Update publish-api-documentation.yml 2023-09-03 16:52:30 +07:00
grossmj
483db91851 Use dev for optional development dependencies 2023-08-10 23:16:57 +10:00
grossmj
f3d43aeb39 Fix testing.yml 2023-08-10 22:52:35 +10:00
grossmj
1cb433c5bc New packaging relying only pyproject.toml 2023-08-10 22:44:37 +10:00
grossmj
267c4cbbbb Merge branch '2.2' into 3.0
# Conflicts:
#	README.md
#	gns3server/compute/base_node.py
#	gns3server/compute/dynamips/__init__.py
#	gns3server/compute/dynamips/hypervisor.py
#	gns3server/compute/qemu/__init__.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/schemas/qemu_template.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.11410ae4eaf4d4c08cd0.js
#	gns3server/version.py
#	requirements.txt
2023-03-17 17:44:32 +10:00
grossmj
83cb8693e6 Automatically add new issues to GNS3 project 2023-01-31 09:31:52 +08:00
grossmj
72a4d0df4e Update GH actions checkout and setup-python 2022-12-22 09:35:45 +08:00
grossmj
a91ed34f43 Downgrade Ubuntu to 20.04 to fix missing Python 3.6 2022-12-18 14:24:50 +08: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
ec50cc7c0d Support for Python 3.11 2022-10-30 19:04:54 +08:00
grossmj
fad3df453d Run tests on 2.2 branch 2022-08-27 19:31:24 +02:00
grossmj
df50b46952 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
#	requirements.txt
2022-04-27 22:23:05 +07:00
grossmj
a0fcb18395 Use Python 3.7 to publish API documentation 2022-03-28 11:27:53 +10:30
grossmj
db739775d0 Drop Python 3.6 support and require Python >= 3.7 2022-03-14 15:13:26 +10:30
Jeremy Grossmann
70e36be4fd
Create codeql-analysis.yml 2022-03-14 14:21:50 +10:30
grossmj
0b200def88 Merge branch 'master' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	Dockerfile
#	gns3server/version.py
2021-10-09 12:16:50 +10:30
grossmj
568df7e476 Fix running tests with Python 3.10
https://github.com/actions/setup-python/issues/249#issuecomment-934299359
2021-10-07 15:11:53 +10:30
grossmj
d485a857a2 Fix running tests with Python 3.10
https://github.com/actions/setup-python/issues/249#issuecomment-934299359
2021-10-07 15:07:36 +10:30
grossmj
b59b6816c3 Upgrade dependencies and test using Python 3.10 2021-10-07 14:59:53 +10:30
grossmj
94ee197a6e Tests with Python 3.10 2021-10-06 20:27:57 +10:30
grossmj
496170b4e5 Early support for Python3.10 Fixes #1940 2021-08-15 15:09:48 +09:30
grossmj
acc5c7ebfa Update package versions.
Do not use Path in schemas (causes issues with empty paths).
Change how notifications are handled.
Run tests with Python 3.9
2020-11-11 17:18:41 +10:30
grossmj
d6a65883ee Merge branch 'master' into 3.0 2020-10-24 17:08:19 +10:30
grossmj
5743d47327 Set ident for merge. 2020-10-24 17:04:42 +10:30
grossmj
ca69b01d11 Use origin/3.0 for merge into gh-pages branch. 2020-10-24 17:02:44 +10:30
grossmj
dd785b61cf Work directly on gh-pages branch to generate the API documentation. 2020-10-24 16:59:55 +10:30
grossmj
f3a7eba796 Merge branch 'master' into 3.0 2020-10-24 16:49:28 +10:30
grossmj
0f154e5f29 Fix invalid syntax for git merge 2020-10-24 16:45:53 +10:30
grossmj
f9c4c82da6 Fix merge issues on gh-pages branch, second try. 2020-10-24 16:12:17 +10:30
grossmj
3a136a46a1 Fix merge issues on gh-pages branch 2020-10-24 16:07:48 +10:30
grossmj
34f05e92d5 Merge branch 'master' into 3.0 2020-10-24 15:53:44 +10:30
grossmj
a6a35e7c43 Fix publish_api_documentation.yml 2020-10-24 15:42:44 +10:30
grossmj
ec61faa035 Merge branch 'master' into 3.0
# Conflicts:
#	.github/workflows/publish_api_documentation.yml
2020-10-24 15:25:55 +10:30
grossmj
163a867f00 Only automatically build API documentation for 3.0 branch and v3.* tags 2020-10-24 15:24:32 +10:30
grossmj
d2b7c9bcbf Do not build API documentation on schedule. 2020-10-24 13:38:32 +10:30
grossmj
fb8df1cc6b Fetch all history for all tags and branches in publish_api_documentation.yml 2020-10-24 13:13:19 +10:30
grossmj
d063b3e39d Manual trigger API documentation publishing using workflow_dispatch 2020-10-24 13:08:10 +10:30
grossmj
e6bf17185e Manual trigger API documentation publishing using workflow_dispatch 2020-10-24 12:52:32 +10:30
grossmj
83fbd1f627 Fix GitHub Actions error: A branch or tag with the name '3' could not be found. 2020-10-24 12:16:05 +10:30
grossmj
1aa6fe8535 Add publish_api_documentation.yml to master branch for scheduled event to work. 2020-10-23 23:03:50 +10:30
grossmj
5bb6ba73f2 Fix syntax error in publish_api_documentation.yml 2020-10-23 23:01:03 +10:30
grossmj
e568de0aa9 actions/checkout@v2 to checkout 3.0 branch. 2020-10-23 22:57:09 +10:30
grossmj
3f57f5285d Publish API documentation on gh-pages branch 2020-10-23 22:48:50 +10:30
grossmj
b23422e782 Fix publish_api_documentation.yml 2020-10-23 22:29:59 +10:30
grossmj
e39493f8bd Only publish documentation once a day or on tags. 2020-10-23 21:03:28 +10:30
grossmj
b04f9cb6ea Add git add to publish_api_documentation.yml 2020-10-23 19:21:50 +10:30
grossmj
da2d4de89f Fix call to publish_api_documentation.py 2020-10-23 19:17:31 +10:30
grossmj
80ca9100b9 Use Python 3.6 to generate the API documentation 2020-10-23 19:14:14 +10:30