From 9f59ef8385d3ecae23989cefac16d65dd8ce63b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JN=20Hern=C3=A1ndez?= Date: Mon, 15 Apr 2024 11:11:08 -0600 Subject: [PATCH 1/3] Update PyPI Integrations for Release Upload --- .github/workflows/release.yml | 16 +++++++++------- CHANGES.rst | 4 ++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b3f529..3711aa6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,8 @@ jobs: release: name: release runs-on: ubuntu-latest + permissions: + id-token: write steps: - name: Checkout commit and fetch tag history uses: actions/checkout@v2 @@ -25,10 +27,10 @@ jobs: python -m pip install --upgrade pip pip install setuptools wheel twine - - name: Build and publish package - env: - TWINE_USERNAME: ${{ secrets.PYPI_AZAVEA_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_AZAVEA_PASSWORD }} - run: | - python setup.py sdist bdist_wheel - twine upload dist/* + - name: Build release package + run: python setup.py sdist bdist_wheel + + - name: Upload release to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ diff --git a/CHANGES.rst b/CHANGES.rst index 9b01fe6..c6e4871 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -235,3 +235,7 @@ v6.2.0, 2024-01-22 previously would provide an internal Loc_name field in the response which is no longer supplied, which broke the API. Making that field optional in our code fixes this. + +v6.2.1, 2024-04-15 +------------------ + * Update PyPI publishing integration From 153f91d252e5563d3a173d7a3ae4a3283d35a442 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 19 Apr 2024 11:22:56 -0400 Subject: [PATCH 2/3] Update tests to match new case from geocoder --- omgeo/tests/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omgeo/tests/tests.py b/omgeo/tests/tests.py index 5c94861..0304c55 100755 --- a/omgeo/tests/tests.py +++ b/omgeo/tests/tests.py @@ -179,7 +179,7 @@ def test_geocode_esri_wgs_senado_mx(self): """ candidates = self.g_esri_wgs.get_candidates(self.pq['senado_mx']) self.assertOneCandidate(candidates) - search_text = 'Paseo de la Reforma 135' + search_text = 'Paseo de La Reforma 135' self.assertEqual(search_text in candidates[0].match_addr, True, '"%s" not found in match_addr. Got "%s".' % (search_text, candidates[0].match_addr)) @@ -192,7 +192,7 @@ def test_geocode_structured_esri_wgs_senado_mx(self): """ candidates = self.g_esri_wgs.get_candidates(self.pq['senado_mx_struct']) self.assertOneCandidate(candidates) - search_text = 'Paseo de la Reforma 135' + search_text = 'Paseo de La Reforma 135' self.assertEqual(search_text in candidates[0].match_addr, True, '"%s" not found in match_addr. Got "%s".' % (search_text, candidates[0].match_addr)) From 77c242a4d3cbbe1be8d10c9c23e8e532874e2204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JN=20Hern=C3=A1ndez?= Date: Fri, 19 Apr 2024 09:29:45 -0600 Subject: [PATCH 3/3] Update the workflow to upload to PyPI --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3711aa6..1782c5c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,5 @@ jobs: - name: Build release package run: python setup.py sdist bdist_wheel - - name: Upload release to TestPyPI + - name: Upload release to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/