Merge remote-tracking branch 'origin/refs/pull/56/head'

.circleci/config.yml

@@ -16,9 +16,9 @@ commands:
       - run:
           name: Pipenv Install
           command: |
-            python -m pip install --user pip==18.0
+            python -m pip install --user pip
             python -m pip install --user pipenv
-            python -m pipenv --three install --dev
+            python -m pipenv install --dev
           environment:
             PIP_SHIMS_BASE_MODULE: pipenv.patched.notpip
       - save_cache:
@@ -61,7 +61,7 @@ commands:
 executors:
   linux:
     docker:
-      - image: circleci/python:3.7-stretch
+      - image: cimg/python:3.11
         environment:
           PIPENV_VENV_IN_PROJECT: true
   osx:
@@ -118,12 +118,9 @@ jobs:
       - attach_workspace:
           at: ~/mtls-cli
       - pip_install
-      - run:
-          name: Update requirements.txt
-          command: pipenv lock -r > requirements.txt
       - run:
           name: Create Distribution
-          command: make pkg
+          command: make build
       - store_artifacts:
           path: dist/
 

.gitignore

@@ -11,3 +11,4 @@ build
 __pycache__
 *.tar.gz
 .DS_Store
+/src/mtls/__version__.py

Makefile

@@ -3,7 +3,6 @@ PIP_ENV:=$(shell pipenv --venv)
 ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 DESTDIR ?= ~/.local/bin/
 SIGN := 1
-VERSION := $(shell pipenv run python3 setup.py --version)
 
 ifeq ($(OS),Windows_NT)
     UNAME := Windows
@@ -27,7 +26,7 @@ Pipfile.lock:
 requirements.txt:
 	@echo "Generating requirements.txt"
 	@echo "# DO NOT EDIT. This file is generated by running 'make requirements.txt'" > requirements.txt
-	@jq -r '.default|to_entries|map("\(.key)\(.value.version) --hash=\(.value.hashes[0])")[]' Pipfile.lock >> requirements.txt
+	@pipenv requirements --hash >> requirements.txt
 
 .PHONY: set-hooks
 set-hooks:
@@ -45,17 +44,9 @@ format:
 lint:
 	@pipenv run pycodestyle **/*.py
 
-.PHONY: build-develop
-build-develop:
-	@pipenv run python setup.py develop
-
-.PHONY: build-pypi
-build-pypi:
-	@pipenv run python setup.py sdist bdist_wheel
-
 .PHONY: build
 build: setup
-	@pipenv run python setup.py build
+	@pipenv run python -m build
 
 .PHONY: run
 run:
@@ -77,10 +68,7 @@ coverage:
 coveralls:
 	@pipenv run coveralls
 
-.PHONY: pkg
-pkg: build
-	@pipenv run python setup.py sdist bdist_wheel
-
 .PHONY: clean
 clean:
-	@rm -r build dist mtls.egg-info .eggs $(PIP_ENV)
+	@rm dist || true
+	@pipenv clean

Pipfile

@@ -9,6 +9,11 @@ coverage = "==6.2"
 coveralls = "==3.3.1"
 docker = "==5.0.3"
 flake8 = "==4.0.1"
+setuptools = "==62.1.0"
+wheel = "==0.37.1"
+setuptools_scm = "==6.4.2"
+build = "==0.10.0"
+installer = "==0.7.0"
 
 [packages]
 click = "==8.0.1"