Merge pull request #162 from mapillary/feat-update-release

Fix dependencies, build and release process

Author: nickplesha

.circleci/config.yml

@@ -1,54 +1,37 @@
-# This workflow will build the distributions with sdist, bdist_wheel, run tests, format, and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
 name: Mapillary Python SDK - Publishing to PyPi
 
 on:
   push:
     branches: [ main ]
 
 jobs:
-  build:
-    
+  deploy:
     runs-on: ubuntu-latest
-    
+    environment:
+      name: pypi
+      url: https://pypi.org/p/notehub-py
+    permissions:
+      id-token: write
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.x"
 
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip
-          pip install wheel build twine readme-renderer check-manifest
+          pip install pipenv
+          pipenv install
 
-      - name: Setup PyPi RC
+      - name: Build package
         run: |
-          touch ~/.pypirc
-          cat >> ~/.pypyirc <<EOL 
-          [distutils]
-          index-servers =
-            pypi
-            testpypi
+          pipenv run python3 -m build
 
-          [testpypi]
-          repository: https://test.pypi.org/legacy
-          username = ${{ secrets.PYPI_USERNAME }} 
-          password = ${{ secrets.PYPI_PASSWORD }} 
-
-          [pypi]
-          username = ${{ secrets.PYPI_USERNAME }} 
-          password = ${{ secrets.PYPI_PASSWORD }} 
-          EOL
-          
-      - name: Uploading To PyPi
-        run: |
-          python3 setup.py upload
-          
-      - name: Publish a Python distribution to PyPI
+      - name: Publish package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: ${{ secrets.PYPI_USERNAME }} 
-          password: ${{ secrets.PYPI_PASSWORD }}
+          packages-dir: ./dist/

.github/workflows/pypi-publish.yml

@@ -1,6 +1,3 @@
-# This workflow will install Python dependencies, run tests, format, and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
 name: Mapillary Python SDK - PyTest Workflow
 
 on:
@@ -15,18 +12,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: "3.x"
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip && make setup-dev && pip install flake8 black pytest requests mercantile vt2geojson pandas
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        make setup-dev
     - name: Locally install branch's mapillary
       run: |
-        make build && pip3 install -e .
+        make build && make local-install
     - name: Formatting with black
       run: |
         make format
@@ -35,4 +31,4 @@ jobs:
         make lint
     - name: Test with pytest
       run: |
-          make test
+        make test

.github/workflows/pytest.yml

@@ -31,13 +31,13 @@ setup: setup-prod setup-dev
 
 # # Install needed dependencies
 setup-prod:
-	python -m pip install --upgrade pip
+	python3 -m pip install --upgrade pip
 	pip install pipenv
 	pipenv install
 
 # # Install developer dependencies
 setup-dev:
-	python -m pip install --upgrade pip
+	python3 -m pip install --upgrade pip
 	pip install pipenv
 	pipenv install --dev
 
@@ -46,11 +46,11 @@ setup-dev:
 # # Build the package
 build:
 	# Builds the package distributions
-	pipenv run python3 setup.py sdist bdist_wheel --universal
+	pipenv run python3 -m build
 
 local-install:
 	# Locally install mapillary - DO THIS ONLY AFTER RUNNING `make build`
-	pipenv run pip3 install -e .
+	pipenv run pip install -e .
 
 # CODE QUALITY
 
@@ -59,18 +59,18 @@ style: format lint
 
 # # # Formatting
 format:
-	@ black src/mapillary
-	@ black tests/
+	@ pipenv run black src/mapillary
+	@ pipenv run black tests/
 
 # # # Linting
 lint:
-	@ # stop the build if there are Python syntax errors or undefined names
-	@ flake8 src/mapillary --count --select=E9,F63,F7,F82 --show-source --statistics
-	@ flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics	
+	@ # stop the build if there are python3 syntax errors or undefined names
+	@ pipenv run flake8 src/mapillary --count --select=E9,F63,F7,F82 --show-source --statistics
+	@ pipenv run flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
 
 	@ # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-	@ flake8 src/mapillary --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-	@ flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
+	@ pipenv run flake8 src/mapillary --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+	@ pipenv run flake8 tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
 
 # DOCUMENTATION
 
@@ -82,7 +82,7 @@ docs-gen: docs-sphinx docs-py docs-start
 docs-sphinx:
 	sphinx-apidoc -o sphinx-docs ./src/ sphinx-apidoc --full -A 'Mapillary'; cd sphinx-docs; echo "$$PYTHON_SCRIPT" >> conf.py; make markdown;
 
-# # # Python Script for moving markdown from sphinx -> docusaurus
+# # # python3 Script for moving markdown from sphinx -> docusaurus
 docs-py:
 	python3 scripts/documentation.py
 
@@ -132,7 +132,7 @@ dump-clean:
 
 # # Execute pytest on tests/
 test:
-	@ pytest --log-cli-level=20
+	@pipenv run pytest --log-cli-level=20
 
 test-no-warn:
 	@ pytest --log-cli-level=20 --disable-warnings

Makefile

@@ -4,75 +4,28 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-attrs = "==21.2.0"
-bleach = "==3.3.0"
-certifi = "==2021.5.30"
-chardet = "==4.0.0"
-click = "==8.0.1"
-click-plugins = "==1.1.1"
-cligj = "==0.7.2"
-coverage = "==5.5"
-docutils = "==0.17.1"
-future = "==0.18.2"
-hypothesis = "==6.14.0"
-idna = "==2.10"
-iniconfig = "==1.1.1"
-mapbox-vector-tile = "==1.2.1"
-mercantile = "==1.2.1"
-munch = "==2.5.0"
-numpy = "==1.21.0"
-scipy = "==1.7.3"
-pkginfo = "==1.7.0"
-pluggy = "==0.13.1"
-protobuf = "==3.17.3"
-psutil = "==5.8.0"
-py = "==1.10.0"
-pyparsing = "==2.4.7"
-requests = "==2.25.1"
-requests-toolbelt = "==0.9.1"
-six = "==1.16.0"
-sortedcontainers = "==2.4.0"
-tqdm = "==4.61.1"
-twine = "==1.13.0"
-urllib3 = "==1.26.5"
-vt2geojson = "==0.2.1"
-webencodings = "==0.5.1"
-Pygments = "==2.9.0"
-haversine = "==2.3.1"
-python-dotenv = "==0.19.0"
-shapely = "==1.8.1"
-turfpy = "==0.0.7"
-geojson = "==2.5.0"
+mapbox-vector-tile = ">=2.1.0"
+mercantile = ">=1.2.1"
+requests = ">=2.25.1"
+vt2geojson = ">=0.2.1"
+haversine = ">=2.3.1"
+shapely = ">=2.1.0"
+turfpy = ">=0.0.7"
+geojson = ">=2.5.0"
 
 [dev-packages]
-wheel = "==0.37.0"
-build = "==0.6.0.post1"
-pytest = "==6.2.4"
-pytest-arraydiff = "==0.3"
-pytest-astropy = "==0.8.0"
-pytest-astropy-header = "==0.1.2"
-pytest-cov = "==2.12.1"
-pytest-doctestplus = "==0.9.0"
-pytest-filter-subpackage = "==0.1.1"
-pytest-openfiles = "==0.5.0"
-pytest-remotedata = "==0.3.2"
-readme-renderer = "==29.0"
-appdirs = "==1.4.4"
-black = "==21.6b0"
-flake8 = "==3.9.2"
-mccabe = "==0.6.1"
-mypy-extensions = "==0.4.3"
-pathspec = "==0.8.1"
-pycodestyle = "==2.7.0"
-pyflakes = "==2.3.1"
-regex = "==2021.4.4"
-toml = "==0.10.2"
-twine = "==1.13.0"
-check-manifest = "==0.46"
-sphinx = "==5.1.1"
-sphinx-markdown-builder = "==0.5.4"
-sphinx-autodoc-typehints = "==1.12.0"
-python-dateutil = "*"
+haversine = ">=2.3.1"
+mercantile = ">=1.2.1"
+vt2geojson = ">=0.2.1"
+wheel = ">=0.37.0"
+build = ">=0.6.0.post1"
+pytest = ">=6.2.4"
+readme-renderer = ">=29.0"
+black = ">=21.6b0"
+flake8 = ">=3.9.2"
+twine = ">=1.13.0"
+sphinx = ">=5.1.1"
+sphinx-autodoc-typehints = ">=1.12.0"
 pandas = "*"
 
 [pipenv]