Merge pull request #227 from ministryofjustice/pipenv_update

Pipenv update

.github/workflows/check-change-status.yaml

@@ -50,8 +50,7 @@ jobs:
         id: check-change-status
         if: steps.hosted-zone-changed-files.outputs.any_changed == 'true'
         run: |
-          source venv/bin/activate
-          python3 check_change_status.py
+          pipenv run python3 check_change_status.py
         env:
           CHANGE_STATUS_OUTPUT: ${{ env.CHANGE_STATUS_OUTPUT }}
           PYTHONUNBUFFERED: 1

.github/workflows/check-unmanaged-zones.yaml

@@ -18,15 +18,15 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -r requirements.txt
+          make install
 
       - name: Run check for unmanaged zones
         id: check-zones
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.OCTODNS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.OCTODNS_AWS_SECRET_ACCESS_KEY }}
           PYTHONUNBUFFERED: 1
-        run: python check_unmanaged_zones.py
+        run: make check-unmanaged-zones
 
       - name: Send notification to Slack
         uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0

.github/workflows/octodns-dry-run.yaml

@@ -27,8 +27,7 @@ jobs:
 
       - name: Run OctoDNS dry run
         run: |
-          source venv/bin/activate
-          make sync-dry-run
+          pipenv run make sync-dry-run
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.OCTODNS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.OCTODNS_AWS_SECRET_ACCESS_KEY }}

.github/workflows/octodns-sync.yaml

@@ -27,8 +27,7 @@ jobs:
 
       - name: Run OctoDNS sync
         run: |
-          source venv/bin/activate
-          make sync-apply
+          pipenv run make sync-apply
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.OCTODNS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.OCTODNS_AWS_SECRET_ACCESS_KEY }}

.github/workflows/python-test.yaml

@@ -22,9 +22,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          make install
 
       - name: Run tests
         run: |
-          python -m pytest tests/
+          make test

Makefile

@@ -32,10 +32,8 @@ help:
 	@echo "  make validate-zones       - Validate all zone files"
 
 install:
-	python3 -m venv venv
-	. venv/bin/activate && \
-	python3 -m pip install --upgrade pip && \
-	python3 -m pip install -r requirements.txt
+	pip3 install pipenv
+	pipenv install --dev
 
 edit-zone:
 	@if [ -z "$(zone)" ]; then \
@@ -88,19 +86,19 @@ compare-zone:
 
 check-unmanaged-zones: install
 	$(call check_aws_creds)
-	@. venv/bin/activate && python3 check_unmanaged_zones.py
+	@pipenv run python3 check_unmanaged_zones.py
 
 check-empty-zones: install
 	$(call check_aws_creds)
-	@. venv/bin/activate && python3 check_empty_zones.py
+	@pipenv run python3 check_empty_zones.py
 
 clean:
-	@rm -rf venv tmp
+	@pipenv --rm
 	@find . -type f -name "*.pyc" -delete
 	@find . -type d -name "__pycache__" -delete
 
 test: install
-	@. venv/bin/activate && python -m pytest tests/
+	@pipenv run python3 -m pytest tests/
 
 .DEFAULT_GOAL := help
 

Pipfile

@@ -0,0 +1,18 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+boto3 = "==1.34.99"
+octodns = "==1.9.1"
+octodns-route53 = "==0.0.7"
+pytest = "==8.1.1"
+pyyaml = "==6.0.2rc1"
+"ruamel.yaml" = "==0.18.6"
+"ruamel.yaml.clib" = "==0.2.8"
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"