Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into new-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ric-evans committed Feb 2, 2024
2 parents 02b4b2c + 78798ae commit b0292b7
Show file tree
Hide file tree
Showing 12 changed files with 169 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wipac-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
- name: Pytest
run: |
pip install --upgrade pip wheel setuptools pytest
pip install .
pip install .[dev]
pytest -vvvv tests
release:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

<!--next-version-placeholder-->

## v1.9.0 (2024-02-02)



## v1.8.2 (2023-11-30)

### Other
Expand Down
14 changes: 6 additions & 8 deletions dependencies-coloredlogs.log
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
#
# This file was autogenerated by WIPACrepo/wipac-dev-py-setup-action
# from `pip install .[coloredlogs]`
# using Python 3.12.
# using Python 3.11.
#
########################################################################
# pip freeze
########################################################################
certifi==2023.11.17
certifi==2024.2.2
charset-normalizer==3.3.2
coloredlogs==15.0.1
humanfriendly==10.0
idna==3.6
requests==2.31.0
setuptools==69.0.3
typing_extensions==4.9.0
urllib3==2.1.0
wheel==0.42.0
urllib3==2.2.0
########################################################################
# pipdeptree
########################################################################
coloredlogs==15.0.1
└── humanfriendly [required: >=9.1, installed: 10.0]
pip==23.2.1
pipdeptree==2.13.2
setuptools==69.0.3
setuptools==65.5.1
wheel==0.42.0
wipac-dev-tools
├── requests [required: Any, installed: 2.31.0]
│ ├── certifi [required: >=2017.4.17, installed: 2023.11.17]
│ ├── certifi [required: >=2017.4.17, installed: 2024.2.2]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.3.2]
│ ├── idna [required: >=2.5,<4, installed: 3.6]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.1.0]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.0]
└── typing-extensions [required: Any, installed: 4.9.0]
26 changes: 13 additions & 13 deletions dependencies-dev.log
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# This file was autogenerated by WIPACrepo/wipac-dev-py-setup-action
# from `pip install .[dev]`
# using Python 3.12.
# using Python 3.11.
#
########################################################################
# pip freeze
########################################################################
attrs==23.2.0
certifi==2023.11.17
certifi==2024.2.2
charset-normalizer==3.3.2
filelock==3.13.1
flake8==7.0.0
Expand All @@ -20,14 +20,13 @@ packaging==23.2
pluggy==1.4.0
pycodestyle==2.11.1
pyflakes==3.2.0
pytest==7.4.4
pytest==8.0.0
pytest-flake8==1.1.1
pytest-mypy==0.10.3
requests==2.31.0
setuptools==69.0.3
semantic-version==2.10.0
typing_extensions==4.9.0
urllib3==2.1.0
wheel==0.42.0
urllib3==2.2.0
########################################################################
# pipdeptree
########################################################################
Expand All @@ -38,26 +37,27 @@ pytest-flake8==1.1.1
│ ├── mccabe [required: >=0.7.0,<0.8.0, installed: 0.7.0]
│ ├── pycodestyle [required: >=2.11.0,<2.12.0, installed: 2.11.1]
│ └── pyflakes [required: >=3.2.0,<3.3.0, installed: 3.2.0]
└── pytest [required: >=7.0, installed: 7.4.4]
└── pytest [required: >=7.0, installed: 8.0.0]
├── iniconfig [required: Any, installed: 2.0.0]
├── packaging [required: Any, installed: 23.2]
└── pluggy [required: >=0.12,<2.0, installed: 1.4.0]
└── pluggy [required: >=1.3.0,<2.0, installed: 1.4.0]
pytest-mypy==0.10.3
├── attrs [required: >=19.0, installed: 23.2.0]
├── filelock [required: >=3.0, installed: 3.13.1]
├── mypy [required: >=0.900, installed: 1.8.0]
│ ├── mypy-extensions [required: >=1.0.0, installed: 1.0.0]
│ └── typing-extensions [required: >=4.1.0, installed: 4.9.0]
└── pytest [required: >=6.2, installed: 7.4.4]
└── pytest [required: >=6.2, installed: 8.0.0]
├── iniconfig [required: Any, installed: 2.0.0]
├── packaging [required: Any, installed: 23.2]
└── pluggy [required: >=0.12,<2.0, installed: 1.4.0]
setuptools==69.0.3
└── pluggy [required: >=1.3.0,<2.0, installed: 1.4.0]
semantic-version==2.10.0
setuptools==65.5.1
wheel==0.42.0
wipac-dev-tools
├── requests [required: Any, installed: 2.31.0]
│ ├── certifi [required: >=2017.4.17, installed: 2023.11.17]
│ ├── certifi [required: >=2017.4.17, installed: 2024.2.2]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.3.2]
│ ├── idna [required: >=2.5,<4, installed: 3.6]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.1.0]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.0]
└── typing-extensions [required: Any, installed: 4.9.0]
26 changes: 13 additions & 13 deletions dependencies-mypy.log
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
# This file was autogenerated by WIPACrepo/wipac-dev-py-setup-action
# from `pip install .[mypy]`
# using Python 3.12.
# using Python 3.11.
#
########################################################################
# pip freeze
########################################################################
attrs==23.2.0
certifi==2023.11.17
certifi==2024.2.2
charset-normalizer==3.3.2
coloredlogs==15.0.1
filelock==3.13.1
Expand All @@ -22,14 +22,13 @@ packaging==23.2
pluggy==1.4.0
pycodestyle==2.11.1
pyflakes==3.2.0
pytest==7.4.4
pytest==8.0.0
pytest-flake8==1.1.1
pytest-mypy==0.10.3
requests==2.31.0
setuptools==69.0.3
semantic-version==2.10.0
typing_extensions==4.9.0
urllib3==2.1.0
wheel==0.42.0
urllib3==2.2.0
########################################################################
# pipdeptree
########################################################################
Expand All @@ -42,26 +41,27 @@ pytest-flake8==1.1.1
│ ├── mccabe [required: >=0.7.0,<0.8.0, installed: 0.7.0]
│ ├── pycodestyle [required: >=2.11.0,<2.12.0, installed: 2.11.1]
│ └── pyflakes [required: >=3.2.0,<3.3.0, installed: 3.2.0]
└── pytest [required: >=7.0, installed: 7.4.4]
└── pytest [required: >=7.0, installed: 8.0.0]
├── iniconfig [required: Any, installed: 2.0.0]
├── packaging [required: Any, installed: 23.2]
└── pluggy [required: >=0.12,<2.0, installed: 1.4.0]
└── pluggy [required: >=1.3.0,<2.0, installed: 1.4.0]
pytest-mypy==0.10.3
├── attrs [required: >=19.0, installed: 23.2.0]
├── filelock [required: >=3.0, installed: 3.13.1]
├── mypy [required: >=0.900, installed: 1.8.0]
│ ├── mypy-extensions [required: >=1.0.0, installed: 1.0.0]
│ └── typing-extensions [required: >=4.1.0, installed: 4.9.0]
└── pytest [required: >=6.2, installed: 7.4.4]
└── pytest [required: >=6.2, installed: 8.0.0]
├── iniconfig [required: Any, installed: 2.0.0]
├── packaging [required: Any, installed: 23.2]
└── pluggy [required: >=0.12,<2.0, installed: 1.4.0]
setuptools==69.0.3
└── pluggy [required: >=1.3.0,<2.0, installed: 1.4.0]
semantic-version==2.10.0
setuptools==65.5.1
wheel==0.42.0
wipac-dev-tools
├── requests [required: Any, installed: 2.31.0]
│ ├── certifi [required: >=2017.4.17, installed: 2023.11.17]
│ ├── certifi [required: >=2017.4.17, installed: 2024.2.2]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.3.2]
│ ├── idna [required: >=2.5,<4, installed: 3.6]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.1.0]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.0]
└── typing-extensions [required: Any, installed: 4.9.0]
30 changes: 30 additions & 0 deletions dependencies-semvar.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#
# This file was autogenerated by WIPACrepo/wipac-dev-py-setup-action
# from `pip install .[semvar]`
# using Python 3.11.
#
########################################################################
# pip freeze
########################################################################
certifi==2024.2.2
charset-normalizer==3.3.2
idna==3.6
requests==2.31.0
semantic-version==2.10.0
typing_extensions==4.9.0
urllib3==2.2.0
########################################################################
# pipdeptree
########################################################################
pip==23.2.1
pipdeptree==2.13.2
semantic-version==2.10.0
setuptools==65.5.1
wheel==0.42.0
wipac-dev-tools
├── requests [required: Any, installed: 2.31.0]
│ ├── certifi [required: >=2017.4.17, installed: 2024.2.2]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.3.2]
│ ├── idna [required: >=2.5,<4, installed: 3.6]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.0]
└── typing-extensions [required: Any, installed: 4.9.0]
14 changes: 6 additions & 8 deletions dependencies.log
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
#
# This file was autogenerated by WIPACrepo/wipac-dev-py-setup-action
# from `pip install .`
# using Python 3.12.
# using Python 3.11.
#
########################################################################
# pip freeze
########################################################################
certifi==2023.11.17
certifi==2024.2.2
charset-normalizer==3.3.2
idna==3.6
requests==2.31.0
setuptools==69.0.3
typing_extensions==4.9.0
urllib3==2.1.0
wheel==0.42.0
urllib3==2.2.0
########################################################################
# pipdeptree
########################################################################
pip==23.2.1
pipdeptree==2.13.2
setuptools==69.0.3
setuptools==65.5.1
wheel==0.42.0
wipac-dev-tools
├── requests [required: Any, installed: 2.31.0]
│ ├── certifi [required: >=2017.4.17, installed: 2023.11.17]
│ ├── certifi [required: >=2017.4.17, installed: 2024.2.2]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.3.2]
│ ├── idna [required: >=2.5,<4, installed: 3.6]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.1.0]
│ └── urllib3 [required: >=1.21.1,<3, installed: 2.2.0]
└── typing-extensions [required: Any, installed: 4.9.0]
4 changes: 4 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,18 @@ packages = find:
[options.extras_require]
coloredlogs =
coloredlogs
semvar =
semantic-version
dev =
pytest
pytest-flake8
pytest-mypy
requests
%(semvar)s
mypy =
%(coloredlogs)s
%(dev)s
%(semvar)s

[options.package_data] # generated by wipac:cicd_setup_builder: '*'
* = py.typed
Expand Down
35 changes: 35 additions & 0 deletions tests/semvar_parser_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""semvar_parser_test.py."""


import logging

from wipac_dev_tools import semvar_parser_tools

LOGGER = logging.getLogger(__name__)


def test_000() -> None:
"""Test with semvar ranges."""
assert semvar_parser_tools.list_all_majmin_versions(
major=3,
semvar_range=">=3.5.1, <3.9",
# max_minor=99,
) == [(3, 6), (3, 7), (3, 8)]

assert semvar_parser_tools.list_all_majmin_versions(
major=3,
semvar_range=">=3.5.1",
max_minor=8,
) == [(3, 6), (3, 7), (3, 8)]

assert semvar_parser_tools.list_all_majmin_versions(
major=3,
semvar_range=">=3,<3.6,!=3.3",
# max_minor=99,
) == [(3, 0), (3, 1), (3, 2), (3, 4), (3, 5)]

assert not semvar_parser_tools.list_all_majmin_versions(
major=2,
semvar_range=">=3.5.1",
# max_minor=99,
)
3 changes: 2 additions & 1 deletion tests/wipac_dev_tools_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ def test_available() -> None:
}
assert set(wipac_dev_tools.__all__) == all_of_em

# look at dir()
# look at dir() -- includes the non-explicitly exported
availables = set(dir(wipac_dev_tools))
availables = {a for a in availables if not a.startswith("__")}

assert availables == all_of_em | {
"version_info",
"enviro_tools",
"setup_tools",
"semvar_parser_tools",
}
2 changes: 1 addition & 1 deletion wipac_dev_tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
]

# version is a human-readable version number.
__version__ = "1.8.2"
__version__ = "1.9.0"

# version_info is a four-tuple for programmatic comparison. The first
# three numbers are the components of the version number. The fourth
Expand Down
Loading

0 comments on commit b0292b7

Please sign in to comment.