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.

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

v3.1.1 -> develop #1005

Merged
merged 3 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,19 @@ on:

jobs:

pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.11'
- uses: pre-commit/[email protected]


# run unit (and integration tests if account secrets available) on our build matrix
test:
needs: [pre-commit]

strategy:
matrix:
Expand All @@ -39,7 +50,7 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand All @@ -65,7 +76,7 @@ jobs:
${{ steps.get-dependencies.outputs.site_bin_dir }}
key: ${{ runner.os }}-${{ matrix.python }}-build-${{ env.cache-name }}-${{ hashFiles('setup.py') }}-v7

- name: install-py-dependencies
- name: Install py-dependencies
if: steps.cache-dependencies.outputs.cache-hit != 'true'
shell: bash
run: |
Expand All @@ -80,11 +91,6 @@ jobs:
pip install numpy
fi

# - name: lint
# shell: bash
# run: |
# flake8

- name: run-unit-tests
shell: bash
run: |
Expand Down Expand Up @@ -138,15 +144,9 @@ jobs:
pytest -sv tests/integration/synapseclient/test_command_line_client.py
fi

# enforce the code matches the Black code style
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: psf/black@stable
# on a GitHub release, build the pip package and upload it as a GitHub release asset
package:
needs: [test,lint]
needs: [test,pre-commit]

runs-on: ubuntu-20.04

Expand All @@ -157,7 +157,7 @@ jobs:
bdist-package-name: ${{ steps.build-package.outputs.bdist-package-name }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
exclude: '^docs/conf.py'
exclude: '^docs/conf.py|^docs/build/'


repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down
124 changes: 63 additions & 61 deletions Pipfile.lock

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

2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: e61f33e16f39e8cbda346a2c639c4799
config: 90d422e4b09fda20663a5d255dc16438
tags: 645f666f9bcd5a90fca523b33c5a78b7
2 changes: 1 addition & 1 deletion docs/build/html/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '3.1.0',
VERSION: '3.1.1',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
8 changes: 4 additions & 4 deletions docs/build/html/api/Activity.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Provenance &mdash; Synapse Python Client 3.1.0 documentation</title>
<title>Provenance &mdash; Synapse Python Client 3.1.1 documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/custom.css" type="text/css" />
Expand Down Expand Up @@ -37,7 +37,7 @@
<img src="../_static/synapse_logo.png" class="logo" alt="Logo"/>
</a>
<div class="version">
3.1.0
3.1.1
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
Expand Down Expand Up @@ -247,7 +247,7 @@ <h2>Activity<a class="headerlink" href="#activity" title="Permalink to this head

<div role="contentinfo">
<p>&#169; Copyright 2012-2023, Sage Bionetworks.
<span class="lastupdated">Last updated on Oct 23, 2023.
<span class="lastupdated">Last updated on Oct 30, 2023.
</span></p>
</div>

Expand All @@ -268,7 +268,7 @@ <h2>Activity<a class="headerlink" href="#activity" title="Permalink to this head
</script>
<div class="footer">
&copy; <a href="http://sagebase.org/">Sage Bionetworks</a>.
Last updated on Oct 23, 2023.
Last updated on Oct 30, 2023.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.5.0.
</div>
<script type="text/javascript">
Expand Down
8 changes: 4 additions & 4 deletions docs/build/html/api/Annotations.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Annotations &mdash; Synapse Python Client 3.1.0 documentation</title>
<title>Annotations &mdash; Synapse Python Client 3.1.1 documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/custom.css" type="text/css" />
Expand Down Expand Up @@ -37,7 +37,7 @@
<img src="../_static/synapse_logo.png" class="logo" alt="Logo"/>
</a>
<div class="version">
3.1.0
3.1.1
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
Expand Down Expand Up @@ -199,7 +199,7 @@ <h2>Classes<a class="headerlink" href="#classes" title="Permalink to this headli

<div role="contentinfo">
<p>&#169; Copyright 2012-2023, Sage Bionetworks.
<span class="lastupdated">Last updated on Oct 23, 2023.
<span class="lastupdated">Last updated on Oct 30, 2023.
</span></p>
</div>

Expand All @@ -220,7 +220,7 @@ <h2>Classes<a class="headerlink" href="#classes" title="Permalink to this headli
</script>
<div class="footer">
&copy; <a href="http://sagebase.org/">Sage Bionetworks</a>.
Last updated on Oct 23, 2023.
Last updated on Oct 30, 2023.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.5.0.
</div>
<script type="text/javascript">
Expand Down
8 changes: 4 additions & 4 deletions docs/build/html/api/Client.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Client &mdash; Synapse Python Client 3.1.0 documentation</title>
<title>Client &mdash; Synapse Python Client 3.1.1 documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/custom.css" type="text/css" />
Expand Down Expand Up @@ -37,7 +37,7 @@
<img src="../_static/synapse_logo.png" class="logo" alt="Logo"/>
</a>
<div class="version">
3.1.0
3.1.1
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
Expand Down Expand Up @@ -1643,7 +1643,7 @@ <h2>More information<a class="headerlink" href="#more-information" title="Permal

<div role="contentinfo">
<p>&#169; Copyright 2012-2023, Sage Bionetworks.
<span class="lastupdated">Last updated on Oct 23, 2023.
<span class="lastupdated">Last updated on Oct 30, 2023.
</span></p>
</div>

Expand All @@ -1664,7 +1664,7 @@ <h2>More information<a class="headerlink" href="#more-information" title="Permal
</script>
<div class="footer">
&copy; <a href="http://sagebase.org/">Sage Bionetworks</a>.
Last updated on Oct 23, 2023.
Last updated on Oct 30, 2023.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.5.0.
</div>
<script type="text/javascript">
Expand Down
Loading
Loading