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: diffpy/diffpy.pdfgui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.0.5
Choose a base ref
...
head repository: diffpy/diffpy.pdfgui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.1.0rc1
Choose a head ref
  • 13 commits
  • 246 files changed
  • 6 contributors

Commits on Jul 16, 2024

  1. black edits

    cadenmyers13 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    fafdf0f View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge pull request #118 from cadenmyers13/black_edits

    black edits
    sbillinge authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    69b9868 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0974ca1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6eb7215 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge pull request #121 from cadenmyers13/pre-commit

    add flake8, pre-commit, pyproject files
    sbillinge authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f18bfbb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af7b672 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    828d6bb View commit details
    Browse the repository at this point in the history
  4. pin numpy to 1.x for now

    sbillinge committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    68cc9a3 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Merge pull request #123 from sbillinge/tests

    tests
    sbillinge authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    0e4733e View commit details
    Browse the repository at this point in the history
  2. add environment.yml

    sbillinge committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6ecbc61 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #130 from sbillinge/env

    add environment.yml
    sbillinge authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    a45149c View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Cookie (#179)

    * copy .github directory
    
    * nest inside .github
    
    * update for pdfgui
    
    * test tests (#131)
    
    * pin numpy to 1.x for now
    
    * add environment.yml
    
    * test tests
    
    * trigger
    
    * try again with requirements
    
    * try again with requirements
    
    * now update test reqs
    
    * try and handle xwindow display issue
    
    * try using xfvb action
    
    * refactor xvfb action commands
    
    * source activate?
    
    * different tack, generate error and work on test?
    
    * again
    
    * again
    
    * chatgpt method
    
    * supress running qc of meta.yaml in conda-forge by renaming
    
    * try new pyproject.toml
    
    * again2
    
    * forgot to install diffpy.pdfgui!
    
    * back to setup.py
    
    * copyright fixes (#134)
    
    * Flake8v1 (#137)
    
    * move modules to top
    
    * remove extra #s
    
    * line length and extra #s
    
    * extra #s
    
    * modules to top
    
    * replace lambda function and line length
    
    * add # noqa: E501
    
    * modules to top
    
    * fix lambda func
    
    * Flake8v2 (#138)
    
    * fix not in
    
    * fix lambda functions
    
    * remove #
    
    * remove lambda func
    
    * modules to top
    
    * mod to top
    
    * line length and import and #s
    
    * fix line length and #s
    
    * comment unused var, fix imports and #s
    
    * modules to top and inline comment fix
    
    * def functions within function to pass tests
    
    * move functions outside of class
    
    * Flake8v4 (#140)
    
    * capitalize Trustees
    
    * Exception on errorwrapper
    
    * wx.PyObjectError in except
    
    * ValueError and Exception
    
    * Exception
    
    * remove import
    
    * pre-commit errors in comments (#141)
    
    * wx12 and bonlengthdialog (#142)
    
    * wx12 and bonlengthdialog
    
    * devutils/makedist import order
    
    * news (#143)
    
    * cookiecutter: untracked files (#149)
    
    * untracked files
    
    * [pre-commit.ci] auto fixes from pre-commit hooks
    
    * update LICENSE.rst
    
    * update AUTHORS.rst and remove AUTHORS.txt
    
    * tipping our hat
    
    * Remove BSD 3-Clause, leaving Columbia copyright
    
    * remove README from requirements
    
    * replace requirements
    
    * adding wxpython back
    
    * adding back freezegun
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: Simon Billinge <sbillinge@users.noreply.github.com>
    
    * Files in doc directory (#157)
    
    * move images to _static
    
    * move files in .../doc/manual into doc/source
    
    * move .gitignore file
    
    * move rest of files to doc/
    
    * move makefile from doc/source to doc/
    
    * remove Makefile from doc/source
    
    * update Makefile in doc
    
    * add rest of cookiecutter files into doc/source
    
    * add make.bat file
    
    * moving .py files into doc/manual
    
    * move files into manual
    
    * moving images into manual
    
    * add TUTORIAL.rst
    
    * convert .txt to .rst in TUTORIAL
    
    * fix formating
    
    * formating
    
    * formating
    
    * reference formating
    
    * move TUTORIAL.rst to manual
    
    * move tutorial.rst from manual to source
    
    * rm extra tutorial.rst
    
    * add tutorial section to index.rst
    
    * index.rst formating
    
    * files (#158)
    
    * Replace Caden's PR (#160)
    
    Minor copyright fixes and news update
    
    * try workflow for testing (#161)
    
    * workflow for testing
    
    * test unittest
    
    * try Xvfb
    
    * try to remove no test ran line
    
    * [pre-commit.ci] auto fixes from pre-commit hooks
    
    * try to remove no test ran line
    
    * try pytest
    
    ---------
    
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    
    * remove unused files (#166)
    
    * update requirements/run.txt (#165)
    
    * update requirements/run.txt, include right package
    
    * use matplotlib-base
    
    * remove dependency tests (#169)
    
    * fix deprecation warning when test (#170)
    
    * fix pkg_resources deprecation warning
    
    * use __name__
    
    * daemon deprecation
    
    * rst file changes (#171)
    
    * Use the original license
    
    * other file changes
    
    * add a bit more in readme
    
    * remove epydoc (#173)
    
    * build doc (#174)
    
    * build doc
    
    * pre commit
    
    * Apply the new workflow (#168)
    
    * Apply the new workflow
    
    * remove prerelease from docs workflow
    
    * rename to main
    
    ---------
    
    Co-authored-by: Caden Myers <cjm2304@columbia.edu>
    Co-authored-by: Caden Myers <158210249+cadenmyers13@users.noreply.github.com>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: Tieqiong <123656525+Tieqiong@users.noreply.github.com>
    5 people authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    ee8dd92 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e3c452 View commit details
    Browse the repository at this point in the history
Loading