Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cs50/python-cs50
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.0.2
Choose a base ref
...
head repository: cs50/python-cs50
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Jul 28, 2021

  1. Merge pull request #160 from cs50/tests/params

    v7.0.2
    Kareem Zidane authored Jul 28, 2021
    Copy the full SHA
    959abb5 View commit details

Commits on Dec 8, 2021

  1. Copy the full SHA
    98840ee View commit details
  2. adding teardown_appcontext

    dmalan committed Dec 8, 2021
    Copy the full SHA
    3113628 View commit details
  3. updated tests

    dmalan committed Dec 8, 2021
    Copy the full SHA
    4c6108d View commit details
  4. removed old MySQL test

    dmalan committed Dec 8, 2021
    Copy the full SHA
    e1ed957 View commit details
  5. Copy the full SHA
    7240955 View commit details

Commits on Dec 9, 2021

  1. Copy the full SHA
    d827119 View commit details
  2. updated tests

    dmalan committed Dec 9, 2021
    Copy the full SHA
    cb03140 View commit details

Commits on Dec 14, 2021

  1. added wheel, fixes #162

    dmalan committed Dec 14, 2021
    Copy the full SHA
    d9a6315 View commit details

Commits on Feb 6, 2022

  1. updated README

    dmalan committed Feb 6, 2022
    Copy the full SHA
    8c08044 View commit details
  2. Copy the full SHA
    9342365 View commit details
  3. updated tests, Docker, README

    dmalan committed Feb 6, 2022
    Copy the full SHA
    b813f9f View commit details
  4. 1
    Copy the full SHA
    be80c55 View commit details
  5. Merge pull request #163 from cs50/postgresql

    Addresses PostgreSQL rollbacks
    dmalan authored Feb 6, 2022
    Copy the full SHA
    6d9bad7 View commit details
  6. Update LICENSE

    dmalan authored Feb 6, 2022
    Copy the full SHA
    c908273 View commit details
  7. Revert "Update LICENSE"

    This reverts commit c908273.
    dmalan committed Feb 6, 2022
    Copy the full SHA
    351fcb3 View commit details
  8. Update LICENSE

    dmalan committed Feb 6, 2022
    Copy the full SHA
    90fab66 View commit details

Commits on Jun 6, 2022

  1. Copy the full SHA
    d06017f View commit details
  2. Copy the full SHA
    afb51bc View commit details
  3. changed warning to error

    dmalan committed Jun 6, 2022
    Copy the full SHA
    6a5bee0 View commit details
  4. Copy the full SHA
    42482f9 View commit details
  5. Merge pull request #166 from cs50/logging

    using INFO, WARNING, and ERROR instead of DEBUG
    dmalan authored Jun 6, 2022
    Copy the full SHA
    9540ec3 View commit details

Commits on Jun 7, 2022

  1. Copy the full SHA
    a43b565 View commit details
  2. Merge pull request #167 from cs50/flask_env

    scoping INFO and ERROR to FLASK_ENV=development
    dmalan authored Jun 7, 2022
    Copy the full SHA
    0251617 View commit details

Commits on Jun 15, 2022

  1. fixed support for None as NULL

    dmalan committed Jun 15, 2022
    Copy the full SHA
    a6ceac6 View commit details
  2. fixed license

    dmalan committed Jun 15, 2022
    Copy the full SHA
    0039f7e View commit details

Commits on Jul 16, 2022

  1. Copy the full SHA
    7448bc0 View commit details

Commits on Sep 1, 2022

  1. Copy the full SHA
    2353182 View commit details

Commits on Oct 22, 2022

  1. remove travis badge

    rongxin-liu committed Oct 22, 2022
    Copy the full SHA
    07ad96b View commit details

Commits on Nov 19, 2022

  1. Copy the full SHA
    fcc68a1 View commit details

Commits on Dec 1, 2022

  1. Copy the full SHA
    b048ba2 View commit details

Commits on Dec 2, 2022

  1. Copy the full SHA
    bd25298 View commit details
  2. Copy the full SHA
    01236bc View commit details
  3. bump version number

    rongxin-liu committed Dec 2, 2022
    Copy the full SHA
    a3784cc View commit details
  4. Merge pull request #170 from matthiaswenz/conditional-import-sqlite

    Load sqlite module only if sqlite connection
    rongxin-liu authored Dec 2, 2022
    Copy the full SHA
    1cfb99f View commit details
  5. Copy the full SHA
    328a76c View commit details
  6. Copy the full SHA
    0c552d3 View commit details
  7. Copy the full SHA
    3ccbd99 View commit details

Commits on Jan 29, 2023

  1. Respect pep8 and revert 659c8f4

    As described in pep8: "Object type comparisons should always use isinstance() instead of comparing types directly:"
    
    Ref. https://peps.python.org/pep-0008/
    up-n-atom authored Jan 29, 2023
    Copy the full SHA
    777b4da View commit details
  2. Fix order of datetime type checks

    datetime.datetime inherits datetime.date and will prematurely evaluate as an instance of datetime.date.
    up-n-atom authored Jan 29, 2023
    Copy the full SHA
    6096c7e View commit details
  3. bumped version number

    rongxin-liu committed Jan 29, 2023
    Copy the full SHA
    53cf4d2 View commit details
  4. Merge pull request #172 from up-n-atom/type-checking

    Respect pep8 and revert 659c8f4
    rongxin-liu authored Jan 29, 2023
    Copy the full SHA
    5c06978 View commit details
  5. Copy the full SHA
    464f237 View commit details

Commits on Sep 13, 2023

  1. Copy the full SHA
    f807f1e View commit details
  2. Copy the full SHA
    ca09441 View commit details

Commits on Sep 15, 2023

  1. Copy the full SHA
    2ed4803 View commit details

Commits on Sep 23, 2023

  1. Fix method delegation in _flushfile

    Required when the faked stream is already faked and the original fake also uses method delegation.
    aivarannamaa authored Sep 23, 2023
    Copy the full SHA
    b8581fe View commit details
  2. Merge pull request #1 from aivarannamaa/aivarannamaa-flushfile-getattr

    Fix method delegation in _flushfile
    aivarannamaa authored Sep 23, 2023
    Copy the full SHA
    c5b093f View commit details

Commits on Sep 29, 2023

  1. Copy the full SHA
    4424e65 View commit details
  2. Merge pull request #176 from cs50/create-view

    Adds support for 'CREATE VIEW' statement
    rongxin-liu authored Sep 29, 2023
    Copy the full SHA
    955637c View commit details
34 changes: 30 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -20,23 +20,49 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.6'
python-version: '3.12'
check-latest: true
- name: Setup databases
run: |
pip install .
pip install mysqlclient psycopg2-binary
pip install mysqlclient psycopg2-binary SQLAlchemy
- name: Run tests
run: python tests/sql.py
env:
MYSQL_HOST: 127.0.0.1
POSTGRESQL_HOST: 127.0.0.1

- name: Install pypa/build
run: python -m pip install build --user

- name: Build a binary wheel and a source tarball
run: python -m build --sdist --wheel --outdir dist/ .

- name: Deploy to PyPI
if: ${{ github.ref == 'refs/heads/main' }}
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}

- name: Get Version
id: py_version
run: |
echo ::set-output name=version::$(python3 setup.py --version)
- name: Create Release
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/github-script@v7
with:
github-token: ${{ github.token }}
script: |
github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: "v${{ steps.py_version.outputs.version }}",
tag_commitish: "${{ github.sha }}"
})
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
.*
!.github
!/.github/
!.gitignore
!.travis.yml
build/
*.db
*.egg-info/
*.pyc
build/
dist/
test.db
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM cs50/cli

RUN sudo apt update && sudo apt install --yes libmysqlclient-dev pgloader pkg-config postgresql
RUN sudo pip3 install mysqlclient psycopg2-binary

WORKDIR /mnt
Loading