diff --git a/.github/workflows/add-dependabot-request-to-project-t-comm.yaml b/.github/workflows/add-dependabot-request-to-project-t-comm.yaml index 4d24ae7..5d9cbcb 100644 --- a/.github/workflows/add-dependabot-request-to-project-t-comm.yaml +++ b/.github/workflows/add-dependabot-request-to-project-t-comm.yaml @@ -2,23 +2,26 @@ # - https://github.com/srggrs/assign-one-project-github-action name: add-dependabot-request-to-project-t-comm.yaml + on: pull_request: types: - opened - reopened + env: GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }} CREATOR: ${{ github.event.pull_request.user.login }} + jobs: - assign_one_project: + add-dependabot-request-to-project: name: Add dependabot pull request to Senzing Community project runs-on: ubuntu-latest steps: - - name: Assign pull request to project - env: + - name: Assign pull request to project + env: BOOL: ${{ contains( env.CREATOR, 'dependabot' ) }} - uses: Senzing/github-action-add-issue-to-project@main - if: ${{ env.BOOL == 'true' }} - with: - project: 'https://github.com/orgs/Senzing/projects/2' + uses: Senzing/github-action-add-issue-to-project@main + if: ${{ env.BOOL == 'true' }} + with: + project: "https://github.com/orgs/Senzing/projects/2" diff --git a/.github/workflows/add-issue-to-project-t-comm.yaml b/.github/workflows/add-issue-to-project-t-comm.yaml index f2d32d7..978d2b1 100644 --- a/.github/workflows/add-issue-to-project-t-comm.yaml +++ b/.github/workflows/add-issue-to-project-t-comm.yaml @@ -2,20 +2,23 @@ # - https://github.com/srggrs/assign-one-project-github-action name: add-issue-to-project-t-comm.yaml + on: issues: types: - reopened - opened + env: GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }} + jobs: - assign_one_project: + add-issue-to-project: name: Add issue to Senzing Community project runs-on: ubuntu-latest steps: - - name: Assign issue to project - uses: Senzing/github-action-add-issue-to-project@main - with: - project: 'https://github.com/orgs/Senzing/projects/2' - column_name: 'Backlog' + - name: Assign issue to project + uses: Senzing/github-action-add-issue-to-project@main + with: + project: "https://github.com/orgs/Senzing/projects/2" + column_name: "Backlog" diff --git a/.github/workflows/add-triage-label.yaml b/.github/workflows/add-triage-label.yaml index 3153dde..bdbefae 100644 --- a/.github/workflows/add-triage-label.yaml +++ b/.github/workflows/add-triage-label.yaml @@ -3,13 +3,15 @@ # - https://github.com/andymckay/labeler name: add-triage-label.yaml + on: issues: types: - reopened - opened + jobs: - automate-issues-labels: + add-triage-label: name: Add triage label to issue runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build-docker-container.yaml b/.github/workflows/build-docker-container.yaml deleted file mode 100644 index d5f7de4..0000000 --- a/.github/workflows/build-docker-container.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: build-docker-container.yaml -on: - pull_request: - branches: - - main - workflow_dispatch: -jobs: - buildDockerContainer: - name: Build Docker container - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: '0' - - name: Print environment variables - run: printenv - - name: Git Merge With Main - run: git merge origin/main - - name: Build Docker container - run: make docker-build diff --git a/.github/workflows/dependabot-approve-and-merge.yaml b/.github/workflows/dependabot-approve-and-merge.yaml new file mode 100644 index 0000000..114db76 --- /dev/null +++ b/.github/workflows/dependabot-approve-and-merge.yaml @@ -0,0 +1,15 @@ +--- +name: dependabot-approve-and-merge.yaml + +on: + pull_request: + branches: [main] + +jobs: + dependabot-approve-and-merge: + permissions: + contents: write + pull-requests: write + uses: Senzing/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@main + secrets: + SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }} diff --git a/.github/workflows/docker-build-container.yaml b/.github/workflows/docker-build-container.yaml new file mode 100644 index 0000000..e244a15 --- /dev/null +++ b/.github/workflows/docker-build-container.yaml @@ -0,0 +1,18 @@ +name: docker-build-container.yaml + +on: + pull_request: + branches: + - main + workflow_dispatch: + +jobs: + docker-build-container: + runs-on: ubuntu-latest + steps: + - name: Build docker image + uses: Senzing/github-action-docker-buildx-build@latest + with: + image-repository: senzing/xterm + password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/.github/workflows/docker-push-containers-to-dockerhub.yaml b/.github/workflows/docker-push-containers-to-dockerhub.yaml new file mode 100644 index 0000000..6c215b6 --- /dev/null +++ b/.github/workflows/docker-push-containers-to-dockerhub.yaml @@ -0,0 +1,19 @@ +name: docker-push-containers-to-dockerhub.yaml + +on: + push: + tags: + - "[0-9]+.[0-9]+.[0-9]+" + +jobs: + docker-push-containers-to-dockerhub: + runs-on: ubuntu-latest + steps: + - name: Build docker image and push to DockerHub + uses: Senzing/github-action-docker-buildx-build@latest + with: + build-options: "--push" + image-repository: senzing/xterm + image-tag: ${{ github.ref_name }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + username: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/.github/workflows/identify-customer.yaml b/.github/workflows/identify-customer.yaml index d8dcac2..2e9a0da 100644 --- a/.github/workflows/identify-customer.yaml +++ b/.github/workflows/identify-customer.yaml @@ -1,14 +1,17 @@ name: identify-customer.yaml + on: issues: types: - opened + env: GITHUB_TOKEN: ${{ secrets.ORG_MEMBERSHIP_TOKEN }} MEMBER_LIST: ${{ secrets.SENZING_MEMBERS }} CREATOR: ${{ github.actor }} + jobs: - automate-issues-labels: + identify-customer: name: Add customer-submission label runs-on: ubuntu-latest steps: diff --git a/.github/workflows/move-pr-to-done.yaml b/.github/workflows/move-pr-to-done.yaml new file mode 100644 index 0000000..a77c683 --- /dev/null +++ b/.github/workflows/move-pr-to-done.yaml @@ -0,0 +1,12 @@ +--- +name: move-pr-to-done.yaml + +on: + pull_request: + types: [closed] + +jobs: + move-pr-to-done: + uses: Senzing/build-resources/.github/workflows/move-pr-to-done.yaml@main + secrets: + SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }} diff --git a/.github/workflows/pylint.yaml b/.github/workflows/pylint.yaml index a79d8b4..381fa88 100644 --- a/.github/workflows/pylint.yaml +++ b/.github/workflows/pylint.yaml @@ -3,21 +3,21 @@ name: pylint.yaml on: [push] jobs: - build: + pylint: runs-on: ubuntu-latest strategy: matrix: python-version: ["3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install pylint - - name: Analysing the code with pylint - run: | - pylint $(git ls-files '*.py') + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pylint + - name: Analysing the code with pylint + run: | + pylint $(git ls-files '*.py') diff --git a/CHANGELOG.md b/CHANGELOG.md index 54a28f9..c29a614 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - +## [1.4.12] - 2023-09-29 + +### Changed in 1.4.12 + +- In `Dockerfile`, updated FROM instruction to `senzing/senzingapi-tools:3.7.1` +- In `requirements.txt`, updated: + - Flask-SocketIO==5.3.6 + - Flask==2.3.3 + - orjson==3.9.7 + - pandas==2.1.1 + - prettytable==3.9.0 + - PySnooper==1.2.0 + - python-engineio==4.7.1 + - python-socketio==5.9.0 + - setuptools==68.2.2 + - VisiData==2.11.1 + ## [1.4.11] - 2023-06-29 ### Changed in 1.4.11 @@ -19,7 +36,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - pandas==2.0.3 - setuptools==68.0.0 - ## [1.4.10] - 2023-06-15 ### Changed in 1.4.10 diff --git a/Dockerfile b/Dockerfile index 8b19d02..60b7f23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -ARG BASE_IMAGE=senzing/senzingapi-tools:3.6.0 +ARG BASE_IMAGE=senzing/senzingapi-tools:3.7.1 ARG BASE_BUILDER_IMAGE=node:lts-buster-slim ARG IMAGE_NAME="senzing/xterm" ARG IMAGE_MAINTAINER="support@senzing.com" -ARG IMAGE_VERSION="1.4.11" +ARG IMAGE_VERSION="1.4.12" # ----------------------------------------------------------------------------- # Stage: builder @@ -13,7 +13,7 @@ FROM ${BASE_BUILDER_IMAGE} AS builder # Set Shell to use for RUN commands in builder step. -ENV REFRESHED_AT=2023-06-29 +ENV REFRESHED_AT=2023-09-29 # Run as "root" for system installation. diff --git a/package.json b/package.json index 7e4076c..a44ed6d 100644 --- a/package.json +++ b/package.json @@ -15,5 +15,5 @@ "main": "senzing-xterm.js", "name": "senzing-xterm", "repository": "https://github.com/xtermjs/xterm.js", - "version": "1.4.5" + "version": "1.4.12" }