Skip to content

Commit

Permalink
Revert "create single workflow for build, test, publish"
Browse files Browse the repository at this point in the history
  • Loading branch information
mnbf9rca authored Jul 9, 2024
1 parent 29b9419 commit 62a11c1
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 96 deletions.
4 changes: 1 addition & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye",
"features": {
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
"ghcr.io/devcontainers/features/github-cli:1": {}

"ghcr.io/devcontainers-contrib/features/poetry:2": {}
}

// Features to add to the dev container. More info: https://containers.dev/features.
Expand Down
70 changes: 0 additions & 70 deletions .github/workflows/build_and_publish.yml

This file was deleted.

11 changes: 6 additions & 5 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: CodeQL
name: "CodeQL"

on:
workflow_call:
push:
branches-ignore:
- main
branches: ["*", "*/*"]
pull_request:
# The branches below must be a subset of the branches above
branches: ["*", "*/*"]
schedule:
- cron: "43 4 * * 3"

Expand Down Expand Up @@ -71,4 +72,4 @@ jobs:
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3
with:
category: "/language:${{matrix.language}}"
category: "/language:${{matrix.language}}"
3 changes: 1 addition & 2 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
on:
workflow_call:
on: [pull_request]

permissions:
contents: read
Expand Down
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
name: test package
name: Python package

on:
workflow_call:
push:
branches-ignore:
- main


permissions: # Global permissions configuration starts here
contents: read # 'read' access to repository contents
pull-requests: read # 'write' access to pull requests
branches-ignore:
- main
pull_request:
branches:
- main

jobs:
test:
strategy:
matrix:
python-version: ["3.12"]
runs-on: ubuntu-latest
container: ubuntu:latest@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: ${{ matrix.python-version }}
- name: Install OS dependencies for snok/install-poetry
run: |
DEBIAN_FRONTEND=noninteractive apt update
DEBIAN_FRONTEND=noninteractive apt install curl sqlite3 -y
- uses: snok/install-poetry@93ada01c735cc8a383ce0ce2ae205a21c415379b # v1
with:
version: 1.8.3 # pin the version as they keep changing their APIs
Expand All @@ -48,4 +50,4 @@ jobs:
# - name: Upload coverage reports to Codecov
# uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4
# env:
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
[tool.poetry]
name = "pydantic-tfl-api"
version = "0.2.0"
version = "0.1.0"
description = "A Pydantic-based wrapper for the TfL Unified API https://api.tfl.gov.uk/. Not associated with or endorsed by TfL."
authors = ["Rob Aleck <[email protected]>"]
license = "MIT"
readme = "README.md"
homepage = "https://github.com/mnbf9rca/pydantic_tfl_api"
repository = "https://github.com/mnbf9rca/pydantic_tfl_api"

[tool.poetry.dependencies]
python = "^3.12"
pydantic = ">=2.8.2"
requests = ">=2.32.3"
pydantic = "^2.8.2"
requests = "^2.32.3"

[tool.poetry.group.dev.dependencies]
black = "^24.4.2"
Expand Down

0 comments on commit 62a11c1

Please sign in to comment.