Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove gulp from package data, code base and CI tests #3789

Merged
merged 8 commits into from
Apr 28, 2024
Merged

Remove gulp from package data, code base and CI tests #3789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d71dfcf
exclude gulp from package
DanielYang59 Apr 28, 2024
d309f35
Need confirm: update GULP url
DanielYang59 Apr 28, 2024
79fae78
remove `gulp` and libs
DanielYang59 Apr 28, 2024
e7923da
remove gulp test from CI
DanielYang59 Apr 28, 2024
7eae9a1
update download url info in error msg
DanielYang59 Apr 28, 2024
c802b88
Merge branch 'master' into package
DanielYang59 Apr 28, 2024
c954808
Merge branch 'package' of github.com:DanielYang59/pymatgen into package
DanielYang59 Apr 28, 2024
354b6d7
remove cmd_line package from find_namespace_packages in setup.py, fro…
janosh Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# declare HTML, rST and test files as vendored/docs to exclude them when calculating repo languages on GitHub
tests/files/**/* linguist-vendored
cmd_line/* linguist-vendored
docs/**/* linguist-generated
dev_scripts/**/* linguist-vendored
6 changes: 0 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:

env:
PMG_MAPI_KEY: ${{ secrets.PMG_MAPI_KEY }}
GULP_LIB: ${{ github.workspace }}/cmd_line/gulp/Libraries
PMG_VASP_PSP_DIR: ${{ github.workspace }}/tests/files

steps:
Expand All @@ -61,11 +60,6 @@ jobs:
- name: Install uv
run: micromamba run -n pmg pip install uv

- name: Copy GULP to bin
Copy link
Contributor Author

@DanielYang59 DanielYang59 Apr 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed tests for gulp from CI because it's not being run (nor supported to run) anyway:

pymatgen/tests/command_line/test_gulp_caller.py

Lines 33 to 36 in e04444e

gulp_present = which("gulp") and os.getenv("GULP_LIB") and ("win" not in sys.platform)
# disable gulp tests for now. Right now, it is compiled against libgfortran3, which is no longer supported in the new
# Ubuntu 20.04.
gulp_present = False

if: matrix.os == 'ubuntu-latest'
run: |
sudo cp cmd_line/gulp/Linux_64bit/* /usr/local/bin/

- name: Install ubuntu-only conda dependencies
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: ^(docs|tests/files|cmd_line|tasks.py)
exclude: ^(docs|tests/files|tasks.py)

ci:
autoupdate_schedule: monthly
Expand Down
74 changes: 0 additions & 74 deletions cmd_line/gulp/Libraries/belashchenko.lib
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions cmd_line/gulp/Libraries/bks.lib
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions cmd_line/gulp/Libraries/bresme_water.lib
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions cmd_line/gulp/Libraries/bush.lib
View file
Open in desktop

This file was deleted.

98 changes: 0 additions & 98 deletions cmd_line/gulp/Libraries/carbonate.lib
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions cmd_line/gulp/Libraries/catlow.lib
View file
Open in desktop

This file was deleted.

Loading