From 6f2a9de72147aeca1aa3de37f5c638a48b27631e Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 11:56:46 +0200 Subject: [PATCH 01/14] Fixes for readthedocs --- .readthedocs.yaml | 12 ++++++++++++ docs/requirements.txt | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 .readthedocs.yaml create mode 100644 docs/requirements.txt diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..76992fb --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,12 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.11" + apt_packages: + - libgtk-3-dev + +python: + install: + - requirements: docs/requirements.txt \ No newline at end of file diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..a3565fe --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,2 @@ +asn1tools +wxpython>= 4.1.0 From 4a198b15eb1b6a52d2d0548c811f9116d9aed5c6 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 11:59:09 +0200 Subject: [PATCH 02/14] Added doc badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 00d4764..0713abc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ ![Build](https://github.com/Futsch1/asn1editor/workflows/Build/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/Futsch1/asn1editor/badge.svg?branch=master)](https://coveralls.io/github/Futsch1/asn1editor?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/b2492b88948ace2e8a14/maintainability)](https://codeclimate.com/github/Futsch1/asn1editor/maintainability) +![Documentation Status](https://readthedocs.org/projects/asn1editor/badge/?version=latest)](https://asn1editor.readthedocs.io/en/latest/?badge=latest) # asn1editor Python based ASN.1 editor From 49255c4f9d9ba1116a0d509daa049f44f11b6a6a Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:05:38 +0200 Subject: [PATCH 03/14] Badge fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0713abc..4deed19 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![Build](https://github.com/Futsch1/asn1editor/workflows/Build/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/Futsch1/asn1editor/badge.svg?branch=master)](https://coveralls.io/github/Futsch1/asn1editor?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/b2492b88948ace2e8a14/maintainability)](https://codeclimate.com/github/Futsch1/asn1editor/maintainability) -![Documentation Status](https://readthedocs.org/projects/asn1editor/badge/?version=latest)](https://asn1editor.readthedocs.io/en/latest/?badge=latest) +[![Documentation Status](https://readthedocs.org/projects/asn1editor/badge/?version=latest)](https://asn1editor.readthedocs.io/en/latest/?badge=latest) # asn1editor Python based ASN.1 editor From ff9ea0ab6ae5afa95f12f5f3f9d4408fad35335a Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:11:04 +0200 Subject: [PATCH 04/14] Use ubuntu 22.04 and newest wxPython --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 447d26f..f828bcb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: analyze: name: Analyze - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -32,7 +32,7 @@ jobs: run: | sudo apt-get update && sudo apt-get install libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 libsdl2-2.0-0 python -m pip install --upgrade pip - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 wxPython==4.1.0 + pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 pip install wheel coveralls pip install -r requirements.txt From af7b7ce05ba44fc2a4113b693ccd9ad97fef3951 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:14:18 +0200 Subject: [PATCH 05/14] Build fixes --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f828bcb..bd61aa3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - name: Install prerequisites run: | - sudo apt-get update && sudo apt-get install libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 libsdl2-2.0-0 + sudo apt-get update && sudo apt-get install libgtk-3-0 python -m pip install --upgrade pip pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 pip install wheel coveralls From ae7dbf338e534355e16787aa0d1be8e17a7ab213 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:19:11 +0200 Subject: [PATCH 06/14] Build fixes --- .github/workflows/main.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd61aa3..5caa5a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,29 +8,13 @@ jobs: runs-on: ubuntu-22.04 strategy: - fail-fast: false matrix: - language: [ 'python' ] + python-version: ["3.11"] steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Install prerequisites run: | - sudo apt-get update && sudo apt-get install libgtk-3-0 + sudo apt-get update && sudo apt-get install libgtk-3-0 libnotify4 python -m pip install --upgrade pip pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 pip install wheel coveralls From 0b9ebc9ca69c15535fda8c62d79cdcd20576dc3d Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:23:15 +0200 Subject: [PATCH 07/14] Build fixes --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5caa5a6..c37acf7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,6 +12,11 @@ jobs: python-version: ["3.11"] steps: + - uses: actions/checkout@v3 + name: Set up Python ${{ matrix.python-version }} + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} - name: Install prerequisites run: | sudo apt-get update && sudo apt-get install libgtk-3-0 libnotify4 From 138676dc6ecb54d3c294ec84ebce3ff1f6c9d761 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:24:45 +0200 Subject: [PATCH 08/14] Build fixes --- .github/workflows/main.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c37acf7..0394e88 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: Build -on: [push, pull_request] +on: push jobs: analyze: @@ -51,15 +51,14 @@ jobs: release: name: Release to PyPI needs: [ analyze ] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + name: Set up Python 3.11 + - uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.11 - name: Install pypa/build run: | python -m pip install build --user From 9bb85da1ba96f15e51d2b14a90a96d5f98fa3706 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:27:48 +0200 Subject: [PATCH 09/14] Dependency fixes --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0394e88..9019845 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install prerequisites run: | - sudo apt-get update && sudo apt-get install libgtk-3-0 libnotify4 + sudo apt-get update && sudo apt-get install libnotify4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 libsdl2-2.0-0 python -m pip install --upgrade pip pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 pip install wheel coveralls From 661fae7966d8fd8bfcefa8b67447a88282236331 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:32:01 +0200 Subject: [PATCH 10/14] Readthedocs build fix --- .readthedocs.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 76992fb..44bfc39 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -5,7 +5,10 @@ build: tools: python: "3.11" apt_packages: - - libgtk-3-dev + - libnotify4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 libsdl2-2.0-0 + jobs: + pre_create_environment: + - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 python: install: From 68ba5baef1a74d2406f069d8e26e08edc297d72c Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:33:41 +0200 Subject: [PATCH 11/14] Readthedocs build fix --- .readthedocs.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 44bfc39..499f9a6 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,8 +4,7 @@ build: os: ubuntu-22.04 tools: python: "3.11" - apt_packages: - - libnotify4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 libsdl2-2.0-0 + apt_packages: [libnotify4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 libsdl2-2.0-0] jobs: pre_create_environment: - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 From f8250a0b9e0c6b8cb294061dc6e28d7b06d53115 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:35:52 +0200 Subject: [PATCH 12/14] Readthedocs build fix --- .readthedocs.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 499f9a6..3ed180e 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,7 +4,11 @@ build: os: ubuntu-22.04 tools: python: "3.11" - apt_packages: [libnotify4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 libsdl2-2.0-0] + apt_packages: + - libnotify4 + - libsdl2-mixer-2.0-0 + - libsdl2-image-2.0-0 + - libsdl2-2.0-0 jobs: pre_create_environment: - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 From 8c750027f795ef840b38c9b4d22d3a536a50d2b5 Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:39:48 +0200 Subject: [PATCH 13/14] Readthedocs build fix --- .gitignore | 17 +++++++++-------- .readthedocs.yaml | 4 ++-- docs/requirements.txt | 1 - 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 13c25bf..2ae6325 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ -/error_log.txt -/settings.json -/.coverage -/dist/ -/build/ -/asn1editor.egg-info/ -/test.json -/docs/_build/ +error_log.txt +settings.json +.coverage +dist/ +build/ +asn1editor.egg-info/ +test.json +docs/_build/ +.idea/* diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 3ed180e..0c8dc5f 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,8 +10,8 @@ build: - libsdl2-image-2.0-0 - libsdl2-2.0-0 jobs: - pre_create_environment: - - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 + post_create_environment: + - python -m pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython==4.2.1 python: install: diff --git a/docs/requirements.txt b/docs/requirements.txt index a3565fe..1dc2202 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1 @@ asn1tools -wxpython>= 4.1.0 From 3bb487629ea6ab9dea697b9a4b591cd4e313a84b Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Sun, 13 Aug 2023 12:55:41 +0200 Subject: [PATCH 14/14] Use latest upload-artifact action --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9019845..0c23614 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: uses: AndreMiras/coveralls-python-action@develop - name: Upload test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: coverage-report path: coverage/index.html @@ -67,7 +67,7 @@ jobs: git clean -dfx python -m build --sdist --wheel --outdir dist/ . - name: Upload wheel - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: wheel path: dist/*.whl