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

fix(ghactions): clean-up of gh actions and version mapping #145

Merged
merged 6 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/preflight_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ on:

jobs:
lint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -34,14 +34,14 @@ jobs:
- name: Lint with flake8
run: flake8 --exclude test,docs,examples .
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
python-version: ["3.7", "3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Setup Environment
Expand All @@ -65,7 +65,7 @@ jobs:
coveralls:
name: Finish Coveralls
needs: test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: python:3-slim
steps:
- name: Finished
Expand Down
1 change: 0 additions & 1 deletion libnmap/objects/os.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ def __init__(self, osmatch_dict):
pass

def add_osclass(self, osclass_obj):

"""
Add a NmapOSClass object to the OSMatch object. This method is
useful to implement compatibility with older versions of NMAP
Expand Down
2 changes: 0 additions & 2 deletions libnmap/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@


class NmapTask(object):

"""
NmapTask is a internal class used by process. Each time nmap
starts a new task during the scan, a new class will be instantiated.
Expand All @@ -46,7 +45,6 @@ def __init__(self, name, starttime=0, extrainfo=""):


class NmapProcess(Thread):

"""
NmapProcess is a class which wraps around the nmap executable.

Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
black==24.3.0
black==22.8.0
defusedxml==0.6.0
isort==5.6.4
pre-commit
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
from distutils.core import setup
import sys
from distutils.core import setup

if sys.version_info >= (3,0):
if sys.version_info >= (3, 0):
with open("README.rst", encoding="utf-8") as rfile:
long_description = rfile.read()
else: # encoding not compatible with python2
else: # encoding not compatible with python2
with open("README.rst") as rfile:
long_description = rfile.read()

Expand Down