Skip to content

Commit

Permalink
Removed AIS (1704) from HSL department list; advancing version number…
Browse files Browse the repository at this point in the history
… to 1.5.2.
  • Loading branch information
Mike Simpson committed Jan 15, 2020
1 parent 7bcf560 commit bdb80fd
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 58 deletions.
8 changes: 4 additions & 4 deletions DEPLOY.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,16 @@ In a terminal window on my local workstation:
$ git clone https://github.com/ualibraries/patron-groups.git ual-patron-groups
$ cd ual-patron-groups
$ git checkout v1.5.1
$ git checkout v1.5.2
$ cd src/main/python
$ sudo pip3 install --trusted-host pypi.python.org -r requirements.txt
$ python3 setup.py sdist
$ cd ../../..
$ cd src/main/docker
$ cp ../python/dist/petal-1.5.1.tar.gz .
$ docker build -t pgrps:1.5.1 .
$ cp ../python/dist/petal-1.5.2.tar.gz .
$ docker build -t pgrps:1.5.2 .
$ cd ../../..

$ export LDAP_PASSWD=[ldap password]
Expand All @@ -136,4 +136,4 @@ In a terminal window on my local workstation:
$ docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
-e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
-e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
--rm -d pgrps:1.5.1
--rm -d pgrps:1.5.2
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ prerequisites, and then build a source distribution of the module:
% python setup.py sdist

% ls dist
petal-1.5.1.tar.gz
petal-1.5.2.tar.gz
% cd ../../..

Expand All @@ -107,12 +107,12 @@ Change to the Docker source directory, copy the distribution file over
from the Python side, and build the Docker container image:

% cd src/main/docker
% cp ../python/dist/petal-1.5.1.tar.gz .
% docker build -t pgrps:1.5.1 .
% cp ../python/dist/petal-1.5.2.tar.gz .
% docker build -t pgrps:1.5.2 .

% docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
pgrps 1.5.1 16cfafa9d0f1 12 seconds ago 80.1MB
pgrps 1.5.2 16cfafa9d0f1 12 seconds ago 80.1MB
% cd ../../..

Expand All @@ -138,7 +138,7 @@ hand, instantiate using an interactive shell:
% docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
-e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
-e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
--rm -it pgrps:1.5.1 /bin/bash
--rm -it pgrps:1.5.2 /bin/bash

# which petl
/usr/bin/petl
Expand All @@ -161,7 +161,7 @@ in the background:
% docker run -e "LDAP_PASSWD=${LDAP_PASSWD}" \
-e "GROUPER_PASSWD=${GROUPER_PASSWD}" \
-e "SLACK_WEBHOOK=${SLACK_WEBHOOK}" \
--rm -d pgrps:1.5.1
--rm -d pgrps:1.5.2

The log output from the "run_petl" invocation should once again wind
up in the Slack channel associated with the "SLACK_WEBHOOK"
Expand Down
6 changes: 3 additions & 3 deletions src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV PACKAGES="dumb-init bash python3 python3-dev ca-certificates tzdata" \
GROUPER_PASSWD="***supply at runtime***" \
SLACK_WEBHOOK="***supply at runtime***"

ADD petal-1.5.1.tar.gz /var/tmp
ADD petal-1.5.2.tar.gz /var/tmp
ADD run_petl /etc/periodic/daily

RUN echo \
Expand All @@ -27,8 +27,8 @@ RUN echo \
&& echo "US/Arizona" > /etc/timezone \
#
# install petal
&& pip install --trusted-host pypi.python.org -r /var/tmp/petal-1.5.1/requirements.txt \
&& pip install /var/tmp/petal-1.5.1
&& pip install --trusted-host pypi.python.org -r /var/tmp/petal-1.5.2/requirements.txt \
&& pip install /var/tmp/petal-1.5.2

ENTRYPOINT [ "/usr/bin/dumb-init", "--" ]
CMD [ "/usr/sbin/crond", "-f" ]
88 changes: 44 additions & 44 deletions src/main/python/config/petl.ini
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,17 @@ ldap_query =
(employeePrimaryDept=0788)(employeePrimaryDept=0789)(employeePrimaryDept=0790)(employeePrimaryDept=0791)(employeePrimaryDept=0792)
(employeePrimaryDept=0795)(employeePrimaryDept=0796)(employeePrimaryDept=0797)(employeePrimaryDept=0798)(employeePrimaryDept=0799)
(employeePrimaryDept=0850)(employeePrimaryDept=0851)(employeePrimaryDept=0852)(employeePrimaryDept=0853)(employeePrimaryDept=0854)
(employeePrimaryDept=0855)(employeePrimaryDept=1401)(employeePrimaryDept=1704)(employeePrimaryDept=1709)(employeePrimaryDept=1901)
(employeePrimaryDept=1902)(employeePrimaryDept=1903)(employeePrimaryDept=1904)(employeePrimaryDept=1905)(employeePrimaryDept=1906)
(employeePrimaryDept=1907)(employeePrimaryDept=1908)(employeePrimaryDept=2511)(employeePrimaryDept=2533)(employeePrimaryDept=3301)
(employeePrimaryDept=3302)(employeePrimaryDept=3303)(employeePrimaryDept=3310)(employeePrimaryDept=4201)(employeePrimaryDept=4202)
(employeePrimaryDept=4203)(employeePrimaryDept=4204)(employeePrimaryDept=4205)(employeePrimaryDept=4206)(employeePrimaryDept=4207)
(employeePrimaryDept=4209)(employeePrimaryDept=4210)(employeePrimaryDept=4211)(employeePrimaryDept=6801)(employeePrimaryDept=6803)
(employeePrimaryDept=6804)(employeePrimaryDept=6805)(employeePrimaryDept=6806)(employeePrimaryDept=6807)(employeePrimaryDept=6808)
(employeePrimaryDept=6809)(employeePrimaryDept=6810)(employeePrimaryDept=6811)(employeePrimaryDept=6812)(employeePrimaryDept=6813)
(employeePrimaryDept=6814)(employeePrimaryDept=6815)(employeePrimaryDept=6816)(employeePrimaryDept=6817)(employeePrimaryDept=6818)
(employeePrimaryDept=6851)(employeePrimaryDept=713D)(employeePrimaryDept=713P)(employeePrimaryDept=9011)(employeePrimaryDept=9908)
(employeePrimaryDept=9975)(employeePrimaryDept=9985)
(employeePrimaryDept=0855)(employeePrimaryDept=1401)(employeePrimaryDept=1709)(employeePrimaryDept=1901)(employeePrimaryDept=1902)
(employeePrimaryDept=1903)(employeePrimaryDept=1904)(employeePrimaryDept=1905)(employeePrimaryDept=1906)(employeePrimaryDept=1907)
(employeePrimaryDept=1908)(employeePrimaryDept=2511)(employeePrimaryDept=2533)(employeePrimaryDept=3301)(employeePrimaryDept=3302)
(employeePrimaryDept=3303)(employeePrimaryDept=3310)(employeePrimaryDept=4201)(employeePrimaryDept=4202)(employeePrimaryDept=4203)
(employeePrimaryDept=4204)(employeePrimaryDept=4205)(employeePrimaryDept=4206)(employeePrimaryDept=4207)(employeePrimaryDept=4209)
(employeePrimaryDept=4210)(employeePrimaryDept=4211)(employeePrimaryDept=6801)(employeePrimaryDept=6803)(employeePrimaryDept=6804)
(employeePrimaryDept=6805)(employeePrimaryDept=6806)(employeePrimaryDept=6807)(employeePrimaryDept=6808)(employeePrimaryDept=6809)
(employeePrimaryDept=6810)(employeePrimaryDept=6811)(employeePrimaryDept=6812)(employeePrimaryDept=6813)(employeePrimaryDept=6814)
(employeePrimaryDept=6815)(employeePrimaryDept=6816)(employeePrimaryDept=6817)(employeePrimaryDept=6818)(employeePrimaryDept=6851)
(employeePrimaryDept=713D)(employeePrimaryDept=713P)(employeePrimaryDept=9011)(employeePrimaryDept=9908)(employeePrimaryDept=9975)
(employeePrimaryDept=9985)
)
)
(&
Expand Down Expand Up @@ -200,17 +200,17 @@ ldap_query =
(employeePrimaryDept=0788)(employeePrimaryDept=0789)(employeePrimaryDept=0790)(employeePrimaryDept=0791)(employeePrimaryDept=0792)
(employeePrimaryDept=0795)(employeePrimaryDept=0796)(employeePrimaryDept=0797)(employeePrimaryDept=0798)(employeePrimaryDept=0799)
(employeePrimaryDept=0850)(employeePrimaryDept=0851)(employeePrimaryDept=0852)(employeePrimaryDept=0853)(employeePrimaryDept=0854)
(employeePrimaryDept=0855)(employeePrimaryDept=1401)(employeePrimaryDept=1704)(employeePrimaryDept=1709)(employeePrimaryDept=1901)
(employeePrimaryDept=1902)(employeePrimaryDept=1903)(employeePrimaryDept=1904)(employeePrimaryDept=1905)(employeePrimaryDept=1906)
(employeePrimaryDept=1907)(employeePrimaryDept=1908)(employeePrimaryDept=2511)(employeePrimaryDept=2533)(employeePrimaryDept=3301)
(employeePrimaryDept=3302)(employeePrimaryDept=3303)(employeePrimaryDept=3310)(employeePrimaryDept=4201)(employeePrimaryDept=4202)
(employeePrimaryDept=4203)(employeePrimaryDept=4204)(employeePrimaryDept=4205)(employeePrimaryDept=4206)(employeePrimaryDept=4207)
(employeePrimaryDept=4209)(employeePrimaryDept=4210)(employeePrimaryDept=4211)(employeePrimaryDept=6801)(employeePrimaryDept=6803)
(employeePrimaryDept=6804)(employeePrimaryDept=6805)(employeePrimaryDept=6806)(employeePrimaryDept=6807)(employeePrimaryDept=6808)
(employeePrimaryDept=6809)(employeePrimaryDept=6810)(employeePrimaryDept=6811)(employeePrimaryDept=6812)(employeePrimaryDept=6813)
(employeePrimaryDept=6814)(employeePrimaryDept=6815)(employeePrimaryDept=6816)(employeePrimaryDept=6817)(employeePrimaryDept=6818)
(employeePrimaryDept=6851)(employeePrimaryDept=713D)(employeePrimaryDept=713P)(employeePrimaryDept=9011)(employeePrimaryDept=9908)
(employeePrimaryDept=9975)(employeePrimaryDept=9985)
(employeePrimaryDept=0855)(employeePrimaryDept=1401)(employeePrimaryDept=1709)(employeePrimaryDept=1901)(employeePrimaryDept=1902)
(employeePrimaryDept=1903)(employeePrimaryDept=1904)(employeePrimaryDept=1905)(employeePrimaryDept=1906)(employeePrimaryDept=1907)
(employeePrimaryDept=1908)(employeePrimaryDept=2511)(employeePrimaryDept=2533)(employeePrimaryDept=3301)(employeePrimaryDept=3302)
(employeePrimaryDept=3303)(employeePrimaryDept=3310)(employeePrimaryDept=4201)(employeePrimaryDept=4202)(employeePrimaryDept=4203)
(employeePrimaryDept=4204)(employeePrimaryDept=4205)(employeePrimaryDept=4206)(employeePrimaryDept=4207)(employeePrimaryDept=4209)
(employeePrimaryDept=4210)(employeePrimaryDept=4211)(employeePrimaryDept=6801)(employeePrimaryDept=6803)(employeePrimaryDept=6804)
(employeePrimaryDept=6805)(employeePrimaryDept=6806)(employeePrimaryDept=6807)(employeePrimaryDept=6808)(employeePrimaryDept=6809)
(employeePrimaryDept=6810)(employeePrimaryDept=6811)(employeePrimaryDept=6812)(employeePrimaryDept=6813)(employeePrimaryDept=6814)
(employeePrimaryDept=6815)(employeePrimaryDept=6816)(employeePrimaryDept=6817)(employeePrimaryDept=6818)(employeePrimaryDept=6851)
(employeePrimaryDept=713D)(employeePrimaryDept=713P)(employeePrimaryDept=9011)(employeePrimaryDept=9908)(employeePrimaryDept=9975)
(employeePrimaryDept=9985)
)
)
(&
Expand Down Expand Up @@ -270,17 +270,17 @@ ldap_query =
(dccPrimaryDept=0788)(dccPrimaryDept=0789)(dccPrimaryDept=0790)(dccPrimaryDept=0791)(dccPrimaryDept=0792)
(dccPrimaryDept=0795)(dccPrimaryDept=0796)(dccPrimaryDept=0797)(dccPrimaryDept=0798)(dccPrimaryDept=0799)
(dccPrimaryDept=0850)(dccPrimaryDept=0851)(dccPrimaryDept=0852)(dccPrimaryDept=0853)(dccPrimaryDept=0854)
(dccPrimaryDept=0855)(dccPrimaryDept=1401)(dccPrimaryDept=1704)(dccPrimaryDept=1709)(dccPrimaryDept=1901)
(dccPrimaryDept=1902)(dccPrimaryDept=1903)(dccPrimaryDept=1904)(dccPrimaryDept=1905)(dccPrimaryDept=1906)
(dccPrimaryDept=1907)(dccPrimaryDept=1908)(dccPrimaryDept=2511)(dccPrimaryDept=2533)(dccPrimaryDept=3301)
(dccPrimaryDept=3302)(dccPrimaryDept=3303)(dccPrimaryDept=3310)(dccPrimaryDept=4201)(dccPrimaryDept=4202)
(dccPrimaryDept=4203)(dccPrimaryDept=4204)(dccPrimaryDept=4205)(dccPrimaryDept=4206)(dccPrimaryDept=4207)
(dccPrimaryDept=4209)(dccPrimaryDept=4210)(dccPrimaryDept=4211)(dccPrimaryDept=6801)(dccPrimaryDept=6803)
(dccPrimaryDept=6804)(dccPrimaryDept=6805)(dccPrimaryDept=6806)(dccPrimaryDept=6807)(dccPrimaryDept=6808)
(dccPrimaryDept=6809)(dccPrimaryDept=6810)(dccPrimaryDept=6811)(dccPrimaryDept=6812)(dccPrimaryDept=6813)
(dccPrimaryDept=6814)(dccPrimaryDept=6815)(dccPrimaryDept=6816)(dccPrimaryDept=6817)(dccPrimaryDept=6818)
(dccPrimaryDept=6851)(dccPrimaryDept=713D)(dccPrimaryDept=713P)(dccPrimaryDept=9011)(dccPrimaryDept=9908)
(dccPrimaryDept=9975)(dccPrimaryDept=9985)
(dccPrimaryDept=0855)(dccPrimaryDept=1401)(dccPrimaryDept=1709)(dccPrimaryDept=1901)(dccPrimaryDept=1902)
(dccPrimaryDept=1903)(dccPrimaryDept=1904)(dccPrimaryDept=1905)(dccPrimaryDept=1906)(dccPrimaryDept=1907)
(dccPrimaryDept=1908)(dccPrimaryDept=2511)(dccPrimaryDept=2533)(dccPrimaryDept=3301)(dccPrimaryDept=3302)
(dccPrimaryDept=3303)(dccPrimaryDept=3310)(dccPrimaryDept=4201)(dccPrimaryDept=4202)(dccPrimaryDept=4203)
(dccPrimaryDept=4204)(dccPrimaryDept=4205)(dccPrimaryDept=4206)(dccPrimaryDept=4207)(dccPrimaryDept=4209)
(dccPrimaryDept=4210)(dccPrimaryDept=4211)(dccPrimaryDept=6801)(dccPrimaryDept=6803)(dccPrimaryDept=6804)
(dccPrimaryDept=6805)(dccPrimaryDept=6806)(dccPrimaryDept=6807)(dccPrimaryDept=6808)(dccPrimaryDept=6809)
(dccPrimaryDept=6810)(dccPrimaryDept=6811)(dccPrimaryDept=6812)(dccPrimaryDept=6813)(dccPrimaryDept=6814)
(dccPrimaryDept=6815)(dccPrimaryDept=6816)(dccPrimaryDept=6817)(dccPrimaryDept=6818)(dccPrimaryDept=6851)
(dccPrimaryDept=713D)(dccPrimaryDept=713P)(dccPrimaryDept=9011)(dccPrimaryDept=9908)(dccPrimaryDept=9975)
(dccPrimaryDept=9985)
)
)
(&
Expand Down Expand Up @@ -310,17 +310,17 @@ ldap_query =
(employeePrimaryDept=0788)(employeePrimaryDept=0789)(employeePrimaryDept=0790)(employeePrimaryDept=0791)(employeePrimaryDept=0792)
(employeePrimaryDept=0795)(employeePrimaryDept=0796)(employeePrimaryDept=0797)(employeePrimaryDept=0798)(employeePrimaryDept=0799)
(employeePrimaryDept=0850)(employeePrimaryDept=0851)(employeePrimaryDept=0852)(employeePrimaryDept=0853)(employeePrimaryDept=0854)
(employeePrimaryDept=0855)(employeePrimaryDept=1401)(employeePrimaryDept=1704)(employeePrimaryDept=1709)(employeePrimaryDept=1901)
(employeePrimaryDept=1902)(employeePrimaryDept=1903)(employeePrimaryDept=1904)(employeePrimaryDept=1905)(employeePrimaryDept=1906)
(employeePrimaryDept=1907)(employeePrimaryDept=1908)(employeePrimaryDept=2511)(employeePrimaryDept=2533)(employeePrimaryDept=3301)
(employeePrimaryDept=3302)(employeePrimaryDept=3303)(employeePrimaryDept=3310)(employeePrimaryDept=4201)(employeePrimaryDept=4202)
(employeePrimaryDept=4203)(employeePrimaryDept=4204)(employeePrimaryDept=4205)(employeePrimaryDept=4206)(employeePrimaryDept=4207)
(employeePrimaryDept=4209)(employeePrimaryDept=4210)(employeePrimaryDept=4211)(employeePrimaryDept=6801)(employeePrimaryDept=6803)
(employeePrimaryDept=6804)(employeePrimaryDept=6805)(employeePrimaryDept=6806)(employeePrimaryDept=6807)(employeePrimaryDept=6808)
(employeePrimaryDept=6809)(employeePrimaryDept=6810)(employeePrimaryDept=6811)(employeePrimaryDept=6812)(employeePrimaryDept=6813)
(employeePrimaryDept=6814)(employeePrimaryDept=6815)(employeePrimaryDept=6816)(employeePrimaryDept=6817)(employeePrimaryDept=6818)
(employeePrimaryDept=6851)(employeePrimaryDept=713D)(employeePrimaryDept=713P)(employeePrimaryDept=9011)(employeePrimaryDept=9908)
(employeePrimaryDept=9975)(employeePrimaryDept=9985)
(employeePrimaryDept=0855)(employeePrimaryDept=1401)(employeePrimaryDept=1709)(employeePrimaryDept=1901)(employeePrimaryDept=1902)
(employeePrimaryDept=1903)(employeePrimaryDept=1904)(employeePrimaryDept=1905)(employeePrimaryDept=1906)(employeePrimaryDept=1907)
(employeePrimaryDept=1908)(employeePrimaryDept=2511)(employeePrimaryDept=2533)(employeePrimaryDept=3301)(employeePrimaryDept=3302)
(employeePrimaryDept=3303)(employeePrimaryDept=3310)(employeePrimaryDept=4201)(employeePrimaryDept=4202)(employeePrimaryDept=4203)
(employeePrimaryDept=4204)(employeePrimaryDept=4205)(employeePrimaryDept=4206)(employeePrimaryDept=4207)(employeePrimaryDept=4209)
(employeePrimaryDept=4210)(employeePrimaryDept=4211)(employeePrimaryDept=6801)(employeePrimaryDept=6803)(employeePrimaryDept=6804)
(employeePrimaryDept=6805)(employeePrimaryDept=6806)(employeePrimaryDept=6807)(employeePrimaryDept=6808)(employeePrimaryDept=6809)
(employeePrimaryDept=6810)(employeePrimaryDept=6811)(employeePrimaryDept=6812)(employeePrimaryDept=6813)(employeePrimaryDept=6814)
(employeePrimaryDept=6815)(employeePrimaryDept=6816)(employeePrimaryDept=6817)(employeePrimaryDept=6818)(employeePrimaryDept=6851)
(employeePrimaryDept=713D)(employeePrimaryDept=713P)(employeePrimaryDept=9011)(employeePrimaryDept=9908)(employeePrimaryDept=9975)
(employeePrimaryDept=9985)
)
)
)
Expand Down
2 changes: 1 addition & 1 deletion src/main/python/src/petal/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '1.5.1'
__version__ = '1.5.2'

from .ldap_query import LDAPQuery
from .grouper_query import GrouperQuery
Expand Down

0 comments on commit bdb80fd

Please sign in to comment.