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

Remove vestigial future package from requirements #338

Merged
merged 3 commits into from
Jan 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
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
os: ["macOS-latest", "ubuntu-latest", "windows-latest"]
steps:
- uses: actions/checkout@v2
Expand All @@ -28,7 +28,7 @@ jobs:
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}
- name: Install Deps
run: python -m pip install -U tox setuptools virtualenv wheel
run: python -m pip install -U 'tox<4' setuptools virtualenv wheel
- name: Install and Run Tests
run: tox -e py
if: runner.os != 'macOS'
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}-
- name: Install Deps
run: python -m pip install -U tox
run: python -m pip install -U 'tox<4'
- name: Run lint
run: tox -epep8
cover:
Expand All @@ -79,7 +79,7 @@ jobs:
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}-
- name: Install Deps
run: python -m pip install -U tox
run: python -m pip install -U 'tox<4'
- name: Run coverxml
run: tox -ecoverxml
- name: codecov
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Install Deps
run: python -m pip install -U tox
run: python -m pip install -U 'tox<4'
- name: Build Docs
run: tox -edocs
- uses: actions/upload-artifact@v2
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
future
pbr!=2.1.0,>=2.0.0,!=4.0.0,!=4.0.1,!=4.0.2,!=4.0.3 # Apache-2.0
cliff>=2.8.0 # Apache-2.0
python-subunit>=1.4.0 # Apache-2.0/BSD
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ classifier =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Software Development :: Testing
Topic :: Software Development :: Quality Assurance
project_urls =
Expand Down
2 changes: 1 addition & 1 deletion stestr/repository/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import sys
import tempfile

from future.moves.dbm import dumb as my_dbm
from dbm import dumb as my_dbm
from subunit import TestProtocolClient
import subunit.v2
import testtools
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
[tox]
minversion = 1.6
envlist = py310,py39,py38,py37,py36,pep8
envlist = py311,py310,py39,py38,py37,pep8
skipsdist = True

[testenv]
usedevelop = True
install_command = pip install -U --force-reinstall {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
whitelist_externals = find
allowlist_externals =
find
stestr
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
Expand Down