Skip to content

Commit 5cdb925

Browse files
committed
moving version to a file, updating makefile
1 parent a388f1d commit 5cdb925

File tree

13 files changed

+13
-20
lines changed

13 files changed

+13
-20
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#
1616

17-
REPO_NAME ?= $(shell echo $(wildcard */__init__.py) | awk -F'/' '{print $$1}')
17+
REPO_NAME ?= $(shell echo $(wildcard src/*/__init__.py) | awk -F'/' '{print $$2}')
1818
SHELL := /bin/bash
1919
.DEFAULT_GOAL := editable
2020
# postinst = $(wildcard debian/*.postinst.sh)
@@ -47,7 +47,7 @@ clean:
4747
@rm -rf *.egg* build dist *.py[oc] */*.py[co] cover doctest_pypi.cfg \
4848
nosetests.xml pylint.log output.xml flake8.log tests.log \
4949
test-result.xml htmlcov fab.log .coverage __pycache__ \
50-
*/__pycache__ deb_dist .mypy_cache
50+
*/__pycache__ deb_dist .mypy_cache .pytest_cache
5151

5252
pep8:
5353
flake8 --max-line-length=88 --extend-ignore=E203 --exit-zero $(REPO_NAME)/*.py
@@ -67,12 +67,12 @@ mypy:
6767
mypy --strict .
6868

6969
pytest:
70-
pytest
70+
python3 -m pytest
7171

7272
test: editable install_test_requirements pytest
7373

7474
test_cov:
75-
pytest --cov=$(REPO_NAME) --cov-report term-missing
75+
python3 -m pytest --cov=$(REPO_NAME) --cov-report term-missing
7676

7777
black:
7878
black .

setup.cfg

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[metadata]
1919
name = pytak
20-
version = attr: pytak.__version__
20+
version = file: src/pytak/VERSION
2121
url = https://github.com/snstac/pytak
2222
project_urls =
2323
CI: GitHub Actions = https://github.com/snstac/pytak/actions
@@ -30,17 +30,15 @@ maintainer = Greg Albrecht <[email protected]>
3030
maintainer_email = [email protected]
3131
license = Apache 2.0
3232
license_files = LICENSE
33+
authors =
34+
{ name="Greg Albrecht", email="[email protected]" }
35+
requires_python = ">=3.7"
3336
classifiers =
3437
License :: OSI Approved :: Apache Software License
3538
Intended Audience :: Developers
3639
Programming Language :: Python
3740
Programming Language :: Python :: 3
3841
Programming Language :: Python :: 3 :: Only
39-
Programming Language :: Python :: 3.7
40-
Programming Language :: Python :: 3.8
41-
Programming Language :: Python :: 3.9
42-
Programming Language :: Python :: 3.10
43-
Programming Language :: Python :: 3.11
4442
Development Status :: 5 - Production/Stable
4543
Operating System :: POSIX
4644
Operating System :: MacOS :: MacOS X
@@ -55,13 +53,11 @@ keywords =
5553
TAK
5654
TAK Server
5755

58-
5956
[options]
57+
packages = find:
6058
include_package_data = True
61-
packages = pytak, pytak.asyncio_dgram
6259
python_requires = >=3.6, <4
6360

64-
6561
[options.extras_require]
6662
with_crypto = cryptography >= 39.0.0
6763
with_takproto = takproto >= 2.0.0

pytak/__init__.py renamed to src/pytak/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
"""Python Team Awareness Kit (PyTAK) Module."""
1919

20-
__version__ = "7.1.0"
21-
2220
from .constants import ( # NOQA
2321
LOG_LEVEL,
2422
LOG_FORMAT,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)