Merge pull request #57 from kozistr/build/poetry

[Build] pipenv to poetry

Author: kozistr

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
         python-version: ['3.7', '3.8', '3.9']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache pip

.github/workflows/publish.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -27,21 +27,16 @@ jobs:
     needs: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup Python 3.8
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v3
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
-        run: |
-          python3 -m pip install -r requirements.txt
-          python3 -m pip install -U wheel twine
-      - name: Build package
-        run: |
-          make build
+        run: python3 -m pip install -r requirements.txt
       - name: Publish package to PyPI
-        run: |
-          make deploy
         env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          poetry config pypi-token.pypi $PYPI_TOKEN
+          poetry publish --build

Makefile

@@ -1,28 +1,21 @@
-.PHONY: init format test check build deploy requirements
+.PHONY: init format test check requirements
 
 init:
-	python3 -m pip install -U pipenv setuptools
-	python3 -m pipenv install --dev
+	python -m pip install -U poetry
+	python -m poetry install
 
 format:
-	isort --profile black -l 119 pytorch_optimizer tests setup.py lint.py
-	black -S -l 119 pytorch_optimizer tests setup.py lint.py
+	isort --profile black -l 119 pytorch_optimizer tests lint.py
+	black -S -l 119 pytorch_optimizer tests lint.py
 
 test:
-	python3 -m pytest -sv -vv --cov=pytorch_optimizer --cov-report=xml ./tests
+	python -m pytest -sv -vv --cov=pytorch_optimizer --cov-report=xml ./tests
 
 check:
-	isort --check-only --profile black -l 119 pytorch_optimizer tests setup.py lint.py
-	black -S -l 119 --check pytorch_optimizer tests setup.py lint.py
-	python3 lint.py
-
-build:
-	python3 setup.py sdist bdist_wheel
-
-deploy:
-	python3 -m twine check dist/*
-	python3 -m twine upload dist/*
+	isort --check-only --profile black -l 119 pytorch_optimizer tests lint.py
+	black -S -l 119 --check pytorch_optimizer tests lint.py
+	python lint.py
 
 requirements:
-	python3 -m pipenv lock -r > requirements.txt
-	python3 -m pipenv lock -dr > requirements-dev.txt
+	python -m poetry export -f requirements.txt --output requirements.txt --without-hashes
+	python -m poetry export --dev -f requirements.txt --output requirements-dev.txt --without-hashes