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

Update requirements #108

Merged
merged 2 commits into from
Dec 4, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on: [push]

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
max-parallel: 3
matrix:
python-version: [2.7, 3.5, 3.6]
python-version: [3.7, 3.8, 3.9, 3.10]

steps:
- name: Install requirements
Expand Down
2 changes: 0 additions & 2 deletions authappliance/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"""
text dialog based setup tool to configure the privacyIDEA basics.
"""
from __future__ import print_function
import locale
import argparse
import sys
Expand Down Expand Up @@ -68,7 +67,6 @@
from paramiko import SSHException, AutoAddPolicy
from subprocess import Popen, PIPE
import random
import os
from tempfile import NamedTemporaryFile

from authappliance.lib.extdialog import ExtDialog
Expand Down
26 changes: 12 additions & 14 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
bcrypt==3.1.7
cffi==1.15.0
configobj==5.0.6
cryptography==3.3.2
enum34==1.1.6; python_version < '3.0'
ipaddress==1.0.23; python_version < '3.0'
netaddr==0.7.19
paramiko==2.7.1
pycparser==2.19
PyNaCl==1.3.0
pyparsing==2.4.6
pythondialog==3.5.1; python_version >= '3.0'
python2-pythondialog==3.5.1; python_version < '3.0'
six==1.13.0
bcrypt==4.1.1
cffi==1.15.1; python_version == '3.7'
cffi==1.16.0; python_version > '3.7'
configobj==5.0.8
cryptography==41.0.7
netaddr==0.9.0
paramiko==3.3.1
pycparser==2.21
PyNaCl==1.5.0
pyparsing==3.1.1
pythondialog==3.5.3
six==1.16.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import print_function

VERSION = "3.3"
VERSION = "3.3.1"
from setuptools import setup, find_packages
import os
import sys
Expand Down
28 changes: 11 additions & 17 deletions test/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
-r ../requirements.txt
atomicwrites==1.3.0; python_version < '3.0'
attrs==19.3.0
configparser==4.0.2; python_version < '3.0'
contextlib2==0.6.0.post1; python_version < '3.0'
exceptiongroup==1.2.0
funcsigs==1.0.2
importlib-metadata==1.3.0
mock==3.0.5
more-itertools==5.0.0; python_version < '3.0'
more-itertools==8.0.2; python_version >= '3.0'
packaging==20.0
pathlib2==2.3.5; python_version < '3.0'
pluggy==0.13.1
py==1.10.0
pytest==4.6.9; python_version < '3.0'
pytest==5.3.2; python_version >= '3.0'
scandir==1.10.0; python_version < '3.0'
wcwidth==0.1.8
zipp==0.6.0
importlib-metadata==6.7.0; python_version == '3.7'
iniconfig==2.0.0
mock==5.1.0
packaging==23.2
pluggy==1.2.0; python_version == '3.7'
pluggy==1.3.0; python_version > '3.7'
pytest==7.4.3
tomli==2.0.1
typing-extensions==4.7.1; python_version == '3.7'
zipp==3.15.0; python_version == '3.7'
12 changes: 5 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
[tox]
envlist = py27,py35,py36,py37
envlist = py37, py38, py39, py310

[gh-actions]
python =
2.7: py27
3.5: py35
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310

[testenv]
# install pytest in the virtualenv where commands will be executed
deps =
-Urtest/requirements.txt
-r test/requirements.txt
pytest-cov
# should we add privacyidea to test/requirements.txt?
privacyidea
# currently this package is missing in privacyIDEAs setup.py
flask-versioned
commands =
# NOTE: you can run any command line tool here - not just tests
python -b -m pytest --cov=authappliance test/
Loading