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: radik/pbs-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Exabyte-io/pbs-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Oct 20, 2020

  1. Copy the full SHA
    06e3d53 View commit details
  2. Unit test stub glitch

    triplepoint committed Oct 20, 2020
    Copy the full SHA
    68fd03e View commit details
  3. More attempts at packaging this thing

    triplepoint authored and root committed Oct 20, 2020
    Copy the full SHA
    5a989bf View commit details
  4. Copy the full SHA
    cc69e90 View commit details
  5. Allow python 2.7, to start with in the setup.py

    Also, fix a python anachronism in pbs.py, for how exceptions are raised
    
    Fill out a few define unit tests, based on how capy is calling pbs
    triplepoint committed Oct 20, 2020
    Copy the full SHA
    23914d9 View commit details
  6. Copy the full SHA
    a5abff4 View commit details
  7. Copy the full SHA
    bc46e32 View commit details
  8. Copy the full SHA
    dcd844b View commit details

Commits on Oct 21, 2020

  1. Rebuilt for Python 3.

    triplepoint committed Oct 21, 2020
    Copy the full SHA
    2d54a26 View commit details
  2. Rebuild _pbs.so for py2 with the same technique we used for py3.

    Might as well have these consistent.
    triplepoint committed Oct 21, 2020
    Copy the full SHA
    c0647be View commit details
  3. Copy the full SHA
    aa62a7a View commit details
  4. Copy the full SHA
    e591522 View commit details
  5. Copy the full SHA
    fa56612 View commit details
  6. Copy the full SHA
    2bb6cc7 View commit details
  7. Copy the full SHA
    5dea316 View commit details
  8. Copy the full SHA
    36ad606 View commit details
  9. Try it in a container

    triplepoint committed Oct 21, 2020
    Copy the full SHA
    781dfe3 View commit details
  10. Copy the full SHA
    dab40c4 View commit details
  11. install pip first?

    triplepoint committed Oct 21, 2020
    Copy the full SHA
    bef2546 View commit details
  12. Copy the full SHA
    3fa43e0 View commit details
  13. add epel-release

    triplepoint committed Oct 21, 2020
    Copy the full SHA
    0c2ef37 View commit details
  14. Copy the full SHA
    4042a04 View commit details
  15. Copy the full SHA
    0ee2ef3 View commit details
  16. Copy the full SHA
    dd429a9 View commit details
  17. Copy the full SHA
    1a6f6a3 View commit details
  18. Copy the full SHA
    9aed9a5 View commit details
  19. Copy the full SHA
    aa3c5dc View commit details
  20. Copy the full SHA
    cb45533 View commit details
  21. Copy the full SHA
    7e6bbf1 View commit details
  22. Copy the full SHA
    f428342 View commit details
  23. Copy the full SHA
    d1a6677 View commit details
  24. Copy the full SHA
    6cdadfc View commit details
  25. Copy the full SHA
    28fad51 View commit details
  26. Copy the full SHA
    d101f3a View commit details
  27. Copy the full SHA
    4df3d96 View commit details
  28. typo

    triplepoint committed Oct 21, 2020
    Copy the full SHA
    ced0aea View commit details
  29. Copy the full SHA
    33e22e4 View commit details
  30. Use the fileserver secret

    triplepoint committed Oct 21, 2020
    Copy the full SHA
    7a6b3b5 View commit details

Commits on Oct 26, 2020

  1. Copy the full SHA
    184cb4b View commit details
  2. Standardize on the author

    triplepoint committed Oct 26, 2020
    Copy the full SHA
    e7fd2e1 View commit details
  3. Merge pull request #1 from Exabyte-io/feature/SOF-4096

    feature/SOF-4096 - Python 3 refactor
    triplepoint authored Oct 26, 2020
    Copy the full SHA
    f423fb4 View commit details
  4. Merge pull request #2 from Exabyte-io/dev

    Python 3 compatibility
    triplepoint authored Oct 26, 2020
    Copy the full SHA
    72644c3 View commit details
  5. Copy the full SHA
    43c2cc3 View commit details
  6. Merge pull request #3 from Exabyte-io/dev

    Repair how the .so shared libraries are included in the python package
    triplepoint authored Oct 26, 2020
    Copy the full SHA
    ed2676a View commit details

Commits on Oct 27, 2020

  1. Building pbs-python against python 3.9 results in the .so being insta…

    …lled in the wrong directory
    triplepoint committed Oct 27, 2020
    Copy the full SHA
    2990787 View commit details
  2. Copy the full SHA
    c68f23a View commit details
  3. Merge pull request #4 from Exabyte-io/dev

    Packages should be built on py3.8
    triplepoint authored Oct 27, 2020
    Copy the full SHA
    c9d0756 View commit details

Commits on Nov 19, 2020

  1. Copy the full SHA
    61194c3 View commit details

Commits on Dec 12, 2020

  1. Copy the full SHA
    0ecfc88 View commit details

Commits on Apr 22, 2021

  1. Implement setuptools-scm.

    Add test coverage reports.
    triplepoint committed Apr 22, 2021
    Copy the full SHA
    6b4ad73 View commit details
110 changes: 110 additions & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Python package tests

on: [push]

jobs:
run-linter:
runs-on: ubuntu-20.04
# Intentionally disable running linter b/c it fails with many errors
if: github.ref_name == 'BLAH'
strategy:
matrix:
python-version: [3.10.13]

steps:
- name: Checkout this repository
uses: actions/checkout@v3
with:
lfs: true

- name: Checkout actions repository
uses: actions/checkout@v3
with:
repository: Exabyte-io/actions
token: ${{ secrets.BOT_GITHUB_TOKEN }}
path: actions

- name: Run ruff linter
uses: ./actions/py/lint
with:
python-version: ${{ matrix.python-version }}


run-tests:
runs-on: ubuntu-20.04
strategy:
matrix:
container-name:
- almalinux:9
container:
image: ${{ matrix.container-name }}

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install dependencies for Python build
run: |
dnf install -y dnf-plugins-core
dnf install -y gcc openssl openssl-devel bzip2-devel libffi-devel zlib-devel make wget curl-minimal
dnf install -y git
- name: Download and Install Python 3.10 from Source
run: |
PYTHON_VERSION=3.10.12
wget https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz
tar -xzf Python-$PYTHON_VERSION.tgz
cd Python-$PYTHON_VERSION
./configure --enable-optimizations
make -j $(nproc)
make altinstall # This installs it as `python3.10` without overwriting the default `python3`
ln -s /usr/local/bin/python3.10 /usr/local/bin/python # Link it as `python`
- name: Verify Python and SSL module
run: |
python --version
python -c "import ssl; print('SSL support is available:', ssl.OPENSSL_VERSION)"
- name: Install Torque
run: |
dnf install -y epel-release
dnf install -y torque torque-client torque-devel torque-drmaa torque-mom torque-server torque-scheduler
dnf install -y compat-openssl11
- name: Upgrade pip and install dependencies
run: |
python3.10 -m pip install ".[all]"
- name: Unit tests
run: |
python3.10 -m unittest discover --verbose --catch --start-directory tests/unit
publish:
needs:
# - run-linter
- run-tests
runs-on: ubuntu-20.04
if: github.ref_name == 'dev'

steps:
- name: Checkout this repository
uses: actions/checkout@v3
with:
lfs: true

- name: Checkout actions repository
uses: actions/checkout@v3
with:
repository: Exabyte-io/actions
token: ${{ secrets.BOT_GITHUB_TOKEN }}
path: actions

- name: Publish release
uses: ./actions/py/publish
with:
python-version: 3.x
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
pypi-api-token: ${{ secrets.PYPI_API_TOKEN }}
97 changes: 90 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
.idea/
# Created by .ignore support plugin (hsz.mobi)
*~
.DS_Store
### Python template
*.pyc
.idea
Vagrantfile
.vagrant
htmlcov_*
coverage_*.xml
venv*/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
@@ -23,9 +27,12 @@ lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
@@ -40,24 +47,100 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/
15 changes: 15 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# LICENSE

Copyright 2024 Exabyte Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
5 changes: 3 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include _pbs.so
include pbs.pth
include pbs/_pbs.so
include pbs/_pbs.cpython-38-x86_64-linux-gnu.so
include pbs/_pbs.cpython-310-x86_64-linux-gnu.so
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@

This is pip-package of [pbs_python 4.4.1](http://oss.trac.surfsara.nl/pbs_python)
by Bas van der Vlies (bas.vandervlies@surfsara.nl).
Native extensions from this package compiled on CentOS 6.5 with PBS Torque 5
Native extensions from this package compiled on CentOS 7.5 with PBS Torque 5
installed on it and probably not compatible with other versions.
Binary file removed _pbs.so
Binary file not shown.
1 change: 0 additions & 1 deletion pbs.pth

This file was deleted.

Loading