Merge pull request #1117 from gchq/python-client-migration

.github/workflows/build.js.yml

@@ -491,13 +491,13 @@ jobs:
         run: |
           python -m pip install --upgrade pip
 
-          cd lib/python-beta
+          cd lib/python
           python -m pip install -e .[test]
 
       # Run tests
       - name: Test with pytest
         run: |
-          cd lib/python-beta
+          cd lib/python
           python -m pytest -m integration
 
       - name: Dump docker-compose logs

.github/workflows/python-publish-test.yml

@@ -24,7 +24,7 @@ jobs:
         uses: tj-actions/changed-files@v40
         with:
           files: |
-            lib/python-beta/src/bailo/__init__.py
+            lib/python/src/bailo/__init__.py
 
       # Setup Python
       - name: Set up Python
@@ -39,15 +39,15 @@ jobs:
       # Build Bailo distribution
       - name: Build a binary wheel and a source tarball
         run: |
-          cd lib/python-beta
+          cd lib/python
           python3 -m build
 
       # Upload Bailo artifact
       - name: Store the distribution packages
         uses: actions/upload-artifact@v3
         with:
           name: python-package-distributions
-          path: lib/python-beta/dist/
+          path: lib/python/dist/
 
   publish-to-testpypi:
     name: Publish Bailo distribution to TestPyPI
@@ -69,12 +69,12 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: python-package-distributions
-          path: lib/python-beta/dist/
+          path: lib/python/dist/
 
       # Publish artifact to TestPyPI
       - name: Publish distribution to TestPyPI
         if: needs.build.outputs.files-changed-output == 'true'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          packages-dir: lib/python-beta/dist/
+          packages-dir: lib/python/dist/
           repository-url: https://test.pypi.org/legacy/

.github/workflows/python-publish.yml

@@ -22,7 +22,7 @@ jobs:
         uses: tj-actions/changed-files@v40
         with:
           files: |
-            lib/python-beta/src/bailo/__init__.py
+            lib/python/src/bailo/__init__.py
 
       # Setup Python
       - name: Set up Python
@@ -37,15 +37,15 @@ jobs:
       # Build Bailo distribution
       - name: Build a binary wheel and a source tarball
         run: |
-          cd lib/python-beta
+          cd lib/python
           python3 -m build
 
       # Upload Bailo artifact
       - name: Store the distribution packages
         uses: actions/upload-artifact@v3
         with:
           name: python-package-distributions
-          path: lib/python-beta/dist/
+          path: lib/python/dist/
 
   publish-to-pypi:
     name: Publish Bailo distribution to PyPI
@@ -67,11 +67,11 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: python-package-distributions
-          path: lib/python-beta/dist/
+          path: lib/python/dist/
 
       # Publish artifact to PyPI
       - name: Publish distribution to PyPI
         if: needs.build.outputs.files-changed-output == 'true'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          packages-dir: lib/python-beta/dist/
+          packages-dir: lib/python/dist/

.github/workflows/python.yml

@@ -23,23 +23,23 @@ jobs:
         run: |
           python -m pip install --upgrade pip
 
-          cd lib/python-beta
+          cd lib/python
           python -m pip install -e .[test]
 
       # Black
       - name: Check formatting
         run: |
-          cd lib/python-beta
+          cd lib/python
           black --check --verbose .
 
       # Pylint
       - name: Check linting
         run: |
-          cd lib/python-beta
+          cd lib/python
           pylint src/bailo --verbose --exit-zero --fail-on=F,E
 
       # Pytest
       - name: Run basic testing
         run: |
-          cd lib/python-beta
+          cd lib/python
           python -m pytest

.prettierignore

@@ -8,8 +8,8 @@ frontend/.next
 frontend/dist
 frontend/node_modules
 infrastructure
-lib/python-beta/docs/pylint.md
+lib/python/docs/pylint.md
 node_modules
 .dockerignore
-lib/python-beta/docs/_build
+lib/python/docs/_build
 backend/coverage

.vscode/settings.json

@@ -17,15 +17,15 @@
   "python.testing.unittestEnabled": false,
   "python.testing.pytestEnabled": true,
   "pylint.args": [
-    "--rcfile=lib/python-beta/pyproject.toml"
+    "--rcfile=lib/python/pyproject.toml"
   ],
   "black-formatter.args": [
-    "--config=lib/python-beta/pyproject.toml"
+    "--config=lib/python/pyproject.toml"
   ],
   "flake8.args": [
-    "--toml-config=lib/python-beta/pyproject.toml"
+    "--toml-config=lib/python/pyproject.toml"
   ],
   "isort.args": [
-    "--settings-path=lib/python-beta/pyproject.toml"
+    "--settings-path=lib/python/pyproject.toml"
   ],
 }